aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHenrik Kretzschmar <henne@nachtwindheim.de>2008-08-22 16:13:05 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:36:52 -0400
commitef0e3c26efe9c52de62b96fdad94de3ed70489d0 (patch)
tree30b89a1d26676acf9dd3a587ee5a72c3d9a731b8 /drivers/media/video
parenteda9e4e29492aff55ceb3f719a6011bddc60a892 (diff)
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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/meye.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index cdaff2fdf394..102a5b9cfd12 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,
1779 goto outnotdev; 1779 goto outnotdev;
1780 } 1780 }
1781 1781
1782 ret = -ENOMEM;
1782 meye.mchip_dev = pcidev; 1783 meye.mchip_dev = pcidev;
1783 meye.video_dev = video_device_alloc(); 1784 meye.video_dev = video_device_alloc();
1784 if (!meye.video_dev) { 1785 if (!meye.video_dev) {
@@ -1786,7 +1787,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
1786 goto outnotdev; 1787 goto outnotdev;
1787 } 1788 }
1788 1789
1789 ret = -ENOMEM;
1790 meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE); 1790 meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE);
1791 if (!meye.grab_temp) { 1791 if (!meye.grab_temp) {
1792 printk(KERN_ERR "meye: grab buffer allocation failed\n"); 1792 printk(KERN_ERR "meye: grab buffer allocation failed\n");