diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-12 15:37:54 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-12 15:37:54 +1000 |
| commit | efaadb89bfb65e10027b2e330b2edf9e4c3e36dc (patch) | |
| tree | 893ef3c707d92edded173fe29ba92d6fcb15a795 /drivers/rpmsg/virtio_rpmsg_bus.c | |
| parent | 8aca60ef32d0ec6da54f92b4f545d86c4c5d129a (diff) | |
| parent | 70035331f72709835ff0cb69c8b4e9719b57e63e (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/rpmsg/virtio_rpmsg_bus.c')
| -rw-r--r-- | drivers/rpmsg/virtio_rpmsg_bus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 33d827b30e95..56fceafec9ec 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -951,8 +951,10 @@ static int rpmsg_probe(struct virtio_device *vdev) bufs_va = dma_alloc_coherent(vdev->dev.parent->parent, RPMSG_TOTAL_BUF_SPACE, &vrp->bufs_dma, GFP_KERNEL); - if (!bufs_va) + if (!bufs_va) { + err = -ENOMEM; goto vqs_del; + } dev_dbg(&vdev->dev, "buffers: va %p, dma 0x%llx\n", bufs_va, (unsigned long long)vrp->bufs_dma); |