diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-24 10:41:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-24 10:41:53 -0300 |
| commit | 4b4308a282febbfa29eb4779f76fc3fd3467e8b3 (patch) | |
| tree | 6a6728acf0bf4962c1bb3c8869f94c5d666b8a29 /linux/drivers | |
| parent | de63d41304f966114dbdba5102c7b122e01569c3 (diff) | |
| download | mediapointer-dvb-s2-4b4308a282febbfa29eb4779f76fc3fd3467e8b3.tar.gz mediapointer-dvb-s2-4b4308a282febbfa29eb4779f76fc3fd3467e8b3.tar.bz2 | |
Fix error code, when camera is not turned on by sonypi
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/meye.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/meye.c b/linux/drivers/media/video/meye.c index afa92ea06..331cb6d1f 100644 --- a/linux/drivers/media/video/meye.c +++ b/linux/drivers/media/video/meye.c @@ -1816,6 +1816,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 " @@ -1823,7 +1824,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; |