diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-09-03 16:11:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-03 17:37:10 -0400 |
commit | 5b5aff83a549c8f1e425e06d46ec951eae950b37 (patch) | |
tree | c435219cc0b870e8a1855ce9fc1e63e31eaddc98 /drivers | |
parent | 4ce0b659689a97bc356e96aeac813cad2d137339 (diff) |
V4L/DVB (8749): Fix error code, when camera is not turned on by sonypi
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/meye.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index 7c8ef6ac6c39..a9ef7802eb5f 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -1806,6 +1806,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev, | |||
1806 | memcpy(meye.video_dev, &meye_template, sizeof(meye_template)); | 1806 | memcpy(meye.video_dev, &meye_template, sizeof(meye_template)); |
1807 | meye.video_dev->parent = &meye.mchip_dev->dev; | 1807 | meye.video_dev->parent = &meye.mchip_dev->dev; |
1808 | 1808 | ||
1809 | ret = -EIO; | ||
1809 | if ((ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1))) { | 1810 | if ((ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1))) { |
1810 | printk(KERN_ERR "meye: unable to power on the camera\n"); | 1811 | printk(KERN_ERR "meye: unable to power on the camera\n"); |
1811 | printk(KERN_ERR "meye: did you enable the camera in " | 1812 | printk(KERN_ERR "meye: did you enable the camera in " |
@@ -1813,7 +1814,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev, | |||
1813 | goto outsonypienable; | 1814 | goto outsonypienable; |
1814 | } | 1815 | } |
1815 | 1816 | ||
1816 | ret = -EIO; | ||
1817 | if ((ret = pci_enable_device(meye.mchip_dev))) { | 1817 | if ((ret = pci_enable_device(meye.mchip_dev))) { |
1818 | printk(KERN_ERR "meye: pci_enable_device failed\n"); | 1818 | printk(KERN_ERR "meye: pci_enable_device failed\n"); |
1819 | goto outenabledev; | 1819 | goto outenabledev; |