From ef0e3c26efe9c52de62b96fdad94de3ed70489d0 Mon Sep 17 00:00:00 2001 From: Henrik Kretzschmar Date: Fri, 22 Aug 2008 17:13:05 -0300 Subject: 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 Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/meye.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/media/video/meye.c') diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index cdaff2fdf39..102a5b9cfd1 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"); -- cgit v1.2.3