---

yaml --- r: 109548 b: refs/heads/master c: 5b5aff8 h: refs/heads/master v: v3
git-mirror · Sep 3, 2008 · a406d0c · a406d0c
1 parent f8c7b1e
commit a406d0c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ce0b659689a97bc356e96aeac813cad2d137339
+refs/heads/master: 5b5aff83a549c8f1e425e06d46ec951eae950b37
diff --git a/trunk/drivers/media/video/meye.c b/trunk/drivers/media/video/meye.c
@@ -1806,14 +1806,14 @@ 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 "
 				"sonypi using the module options ?\n");
 		goto outsonypienable;
 	}
 
-	ret = -EIO;
 	if ((ret = pci_enable_device(meye.mchip_dev))) {
 		printk(KERN_ERR "meye: pci_enable_device failed\n");
 		goto outenabledev;