From: Mauro Carvalho Chehab Date: Wed, 3 Sep 2008 20:11:52 +0000 (-0300) Subject: V4L/DVB (8749): Fix error code, when camera is not turned on by sonypi X-Git-Tag: MMI-PSA29.97-13-9~32053^2~4^2~47 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5b5aff83a549c8f1e425e06d46ec951eae950b37;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git V4L/DVB (8749): Fix error code, when camera is not turned on by sonypi Signed-off-by: Mauro Carvalho Chehab --- 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;