diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-09-03 22:11:52 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-03 23:37:10 +0200 |
| commit | 5b5aff83a549c8f1e425e06d46ec951eae950b37 (patch) | |
| tree | c435219cc0b870e8a1855ce9fc1e63e31eaddc98 /drivers/media/video | |
| parent | V4L/DVB (8728): 1-make-pms-not-autoprobe-when-builtin update (diff) | |
| download | linux-5b5aff83a549c8f1e425e06d46ec951eae950b37.tar.xz linux-5b5aff83a549c8f1e425e06d46ec951eae950b37.zip | |
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/media/video')
| -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, memcpy(meye.video_dev, &meye_template, sizeof(meye_template)); meye.video_dev->parent = &meye.mchip_dev->dev; + ret = -EIO; if ((ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1))) { printk(KERN_ERR "meye: unable to power on the camera\n"); printk(KERN_ERR "meye: did you enable the camera in " @@ -1813,7 +1814,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev, goto outsonypienable; } - ret = -EIO; if ((ret = pci_enable_device(meye.mchip_dev))) { printk(KERN_ERR "meye: pci_enable_device failed\n"); goto outenabledev; |