From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sun, 25 Dec 2016 08:05:58 +0100

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 <elfr...@users.sourceforge.net>
---
 drivers/media/usb/uvc/uvc_driver.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_driver.c 
b/drivers/media/usb/uvc/uvc_driver.c
index 7c42be2414ea..bddaf98ef828 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1275,7 +1275,8 @@ static int uvc_parse_control(struct uvc_device *dev)
                    buffer[1] != USB_DT_CS_INTERFACE)
                        goto next_descriptor;
 
-               if ((ret = uvc_parse_standard_control(dev, buffer, buflen)) < 0)
+               ret = uvc_parse_standard_control(dev, buffer, buflen);
+               if (ret < 0)
                        return ret;
 
 next_descriptor:
@@ -2030,7 +2031,8 @@ static int uvc_probe(struct usb_interface *intf,
                                udev->devpath);
 
        /* Allocate memory for the device and initialize it. */
-       if ((dev = kzalloc(sizeof *dev, GFP_KERNEL)) == NULL)
+       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+       if (!dev)
                return -ENOMEM;
 
        INIT_LIST_HEAD(&dev->entities);
@@ -2113,11 +2115,11 @@ static int uvc_probe(struct usb_interface *intf,
        usb_set_intfdata(intf, dev);
 
        /* Initialize the interrupt URB. */
-       if ((ret = uvc_status_init(dev)) < 0) {
+       ret = uvc_status_init(dev);
+       if (ret < 0)
                uvc_printk(KERN_INFO,
                           "Unable to initialize the status endpoint (%d), 
status interrupt will not be supported.\n",
                           ret);
-       }
 
        uvc_trace(UVC_TRACE_PROBE, "UVC device initialized.\n");
        usb_enable_autosuspend(udev);
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to