[PATCH] V4L: fix return value of meye probe callback

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <mchehab@...>
Cc: <video4linux-list@...>, <linux-kernel@...>
Date: Friday, August 22, 2008 - 4:13 pm

From: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>

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

diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 7c8ef6a..225714b 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1774,6 +1774,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) {
@@ -1781,7 +1782,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");


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] V4L: fix return value of meye probe callback, Henne, (Fri Aug 22, 4:13 pm)