These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / atm / xusbatm.c

diff --git a/kernel/drivers/usb/atm/xusbatm.c b/kernel/drivers/usb/atm/xusbatm.c
index b3b1bb7..a87597f 100644 (file)
--- a/kernel/drivers/usb/atm/xusbatm.c
+++ b/kernel/drivers/usb/atm/xusbatm.c
@@ -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))) {