media: meye: Adjust two function calls together with a variable assignment
authorMarkus Elfring <elfring@users.sourceforge.net>
Sun, 3 Sep 2017 13:41:53 +0000 (09:41 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Sat, 23 Sep 2017 12:31:20 +0000 (08:31 -0400)
The script "checkpatch.pl" pointed information out like the following.

ERROR: do not use assignment in if condition

Thus fix the affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/pci/meye/meye.c

index af9cd02..23999a8 100644 (file)
@@ -1642,14 +1642,15 @@ static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
        meye.vdev = meye_template;
        meye.vdev.v4l2_dev = &meye.v4l2_dev;
 
-       ret = -EIO;
-       if ((ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1))) {
+       ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1);
+       if (ret) {
                v4l2_err(v4l2_dev, "meye: unable to power on the camera\n");
                v4l2_err(v4l2_dev, "meye: did you enable the camera in sonypi using the module options ?\n");
                goto outsonypienable;
        }
 
-       if ((ret = pci_enable_device(meye.mchip_dev))) {
+       ret = pci_enable_device(meye.mchip_dev);
+       if (ret) {
                v4l2_err(v4l2_dev, "meye: pci_enable_device failed\n");
                goto outenabledev;
        }