The patch titled Subject: drivers/rpmsg/virtio_rpmsg_bus.c: fix error return code in rpmsg_probe() has been added to the -mm tree. Its filename is rpmsg-fix-error-return-code-in-rpmsg_probe.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> Subject: drivers/rpmsg/virtio_rpmsg_bus.c: fix error return code in rpmsg_probe() Return a negative error code from the error handling case instead of 0, as returned elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> Cc: Ohad Ben-Cohen <ohad@xxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rpmsg/virtio_rpmsg_bus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN drivers/rpmsg/virtio_rpmsg_bus.c~rpmsg-fix-error-return-code-in-rpmsg_probe drivers/rpmsg/virtio_rpmsg_bus.c --- a/drivers/rpmsg/virtio_rpmsg_bus.c~rpmsg-fix-error-return-code-in-rpmsg_probe +++ a/drivers/rpmsg/virtio_rpmsg_bus.c @@ -951,8 +951,10 @@ static int rpmsg_probe(struct virtio_dev 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); _ Patches currently in -mm which might be from yongjun_wei@xxxxxxxxxxxxxxxxx are origin.patch linux-next.patch cciss-fix-invalid-use-of-sizeof-in-cciss_find_cfgtables.patch rpmsg-fix-error-return-code-in-rpmsg_probe.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html