USB: xusbatm.c: move assignment out of if () block
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Apr 2015 09:33:08 +0000 (11:33 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 10 May 2015 14:01:13 +0000 (16:01 +0200)
We should not be doing assignments within an if () block
so fix up the code to not do this.

change was created using Coccinelle.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Felipe Balbi <balbi@ti.com>
drivers/usb/atm/xusbatm.c

index b3b1bb7..a87597f 100644 (file)
@@ -73,7 +73,8 @@ static int xusbatm_capture_intf(struct usbatm_data *usbatm, struct usb_device *u
                usb_err(usbatm, "%s: failed to claim interface %2d (%d)!\n", __func__, ifnum, ret);
                return ret;
        }
-       if ((ret = usb_set_interface(usb_dev, ifnum, altsetting))) {
+       ret = usb_set_interface(usb_dev, ifnum, altsetting);
+       if (ret) {
                usb_err(usbatm, "%s: altsetting %2d for interface %2d failed (%d)!\n", __func__, altsetting, ifnum, ret);
                return ret;
        }
@@ -128,7 +129,8 @@ static int xusbatm_bind(struct usbatm_data *usbatm,
                        rx_intf->altsetting->desc.bInterfaceNumber,
                        tx_intf->altsetting->desc.bInterfaceNumber);
 
-       if ((ret = xusbatm_capture_intf(usbatm, usb_dev, rx_intf, rx_alt, rx_intf != intf)))
+       ret = xusbatm_capture_intf(usbatm, usb_dev, rx_intf, rx_alt, rx_intf != intf);
+       if (ret)
                return ret;
 
        if ((tx_intf != rx_intf) && (ret = xusbatm_capture_intf(usbatm, usb_dev, tx_intf, tx_alt, tx_intf != intf))) {