diff options
Diffstat (limited to '0019-xusbatm.c-move-assignment-out-of-if-block.patch')
| -rw-r--r-- | 0019-xusbatm.c-move-assignment-out-of-if-block.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/0019-xusbatm.c-move-assignment-out-of-if-block.patch b/0019-xusbatm.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..4ecda2c460218f --- /dev/null +++ b/0019-xusbatm.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,42 @@ +From c4f66c75001c1221c50f19532cbacba6c6ba640e Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:15 +0200 +Subject: [PATCH 19/36] xusbatm.c: move assignment out of if () block + +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> +--- + drivers/usb/atm/xusbatm.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c +index b3b1bb78b2ef..a87597f88a84 100644 +--- a/drivers/usb/atm/xusbatm.c ++++ b/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))) { +-- +2.3.7 + |