hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: meye: Adjust two function calls together with a variable assignment 

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>
This commit is contained in:
Markus Elfring 2017-09-03 09:41:53 -04:00 committed by Mauro Carvalho Chehab
parent 601b1f0ac7
commit 84c62fb996
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/pci/meye/meye.c
View 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 = meye_template;
meye.vdev.v4l2_dev = &meye.v4l2_dev; meye.vdev.v4l2_dev = &meye.v4l2_dev;
ret = -EIO; ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1);
if ((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: unable to power on the camera\n");
v4l2_err(v4l2_dev, "meye: did you enable the camera in sonypi using the module options ?\n"); v4l2_err(v4l2_dev, "meye: did you enable the camera in sonypi using the module options ?\n");
goto outsonypienable; 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"); v4l2_err(v4l2_dev, "meye: pci_enable_device failed\n");
goto outenabledev; goto outenabledev;
} }