public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging: vme: fix error return code in vme_user_probe()
@ 2013-05-13  6:05 Wei Yongjun
  2013-05-13  8:16 ` Martyn Welch
  0 siblings, 1 reply; 6+ messages in thread
From: Wei Yongjun @ 2013-05-13  6:05 UTC (permalink / raw)
  To: martyn.welch, manohar.vanga, gregkh, wfp5p, yamanetoshi,
	gmate.amit, joe
  Cc: yongjun_wei, devel, linux-kernel

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Fix to return -ENOMEM in the resource alloc error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/staging/vme/devices/vme_user.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index da7f759..5fe224d3 100644
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -734,6 +734,7 @@ static int vme_user_probe(struct vme_dev *vdev)
 		if (image[i].resource == NULL) {
 			dev_warn(&vdev->dev,
 				 "Unable to allocate slave resource\n");
+			err = -ENOMEM;
 			goto err_slave;
 		}
 		image[i].size_buf = PCI_BUF_SIZE;
@@ -760,6 +761,7 @@ static int vme_user_probe(struct vme_dev *vdev)
 		if (image[i].resource == NULL) {
 			dev_warn(&vdev->dev,
 				 "Unable to allocate master resource\n");
+			err = -ENOMEM;
 			goto err_master;
 		}
 		image[i].size_buf = PCI_BUF_SIZE;


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-05-15  7:57 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-13  6:05 [PATCH] staging: vme: fix error return code in vme_user_probe() Wei Yongjun
2013-05-13  8:16 ` Martyn Welch
2013-05-13  8:51   ` Dan Carpenter
2013-05-14 13:56     ` Martyn Welch
2013-05-14 14:19       ` Dan Carpenter
2013-05-15  7:56         ` Martyn Welch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox