From: Henrik Kretzschmar <henne@nachtwindheim.de>
Date: Fri, 22 Aug 2008 20:13:05 +0000 (-0300)
Subject: V4L/DVB (8748): V4L: fix return value of meye probe callback
X-Git-Tag: upstream/snapshot3+hdmi~22397^2~258
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef0e3c26efe9c52de62b96fdad94de3ed70489d0;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

V4L/DVB (8748): V4L: fix return value of meye probe callback

The return vaule of the probe function should return -ENOMEM instead
of -EBUSY if video_device_alloc() fails.

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index cdaff2f..102a5b9 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1779,6 +1779,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
 		goto outnotdev;
 	}
 
+	ret = -ENOMEM;
 	meye.mchip_dev = pcidev;
 	meye.video_dev = video_device_alloc();
 	if (!meye.video_dev) {
@@ -1786,7 +1787,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
 		goto outnotdev;
 	}
 
-	ret = -ENOMEM;
 	meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE);
 	if (!meye.grab_temp) {
 		printk(KERN_ERR "meye: grab buffer allocation failed\n");