Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: speedtch.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.

CC: Duncan Sands <duncan.sands@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Felipe Balbi <balbi@ti.com>

+12 -6
+12 -6
drivers/usb/atm/speedtch.c
··· 255 255 256 256 usb_dbg(usbatm, "%s entered\n", __func__); 257 257 258 - if (!(buffer = (unsigned char *)__get_free_page(GFP_KERNEL))) { 258 + buffer = (unsigned char *)__get_free_page(GFP_KERNEL); 259 + if (!buffer) { 259 260 ret = -ENOMEM; 260 261 usb_dbg(usbatm, "%s: no memory for buffer!\n", __func__); 261 262 goto out; ··· 639 638 goto fail; 640 639 } 641 640 642 - if ((int_urb = instance->int_urb)) { 641 + int_urb = instance->int_urb; 642 + if (int_urb) { 643 643 ret = usb_submit_urb(int_urb, GFP_ATOMIC); 644 644 schedule_work(&instance->status_check_work); 645 645 if (ret < 0) { ··· 652 650 return; 653 651 654 652 fail: 655 - if ((int_urb = instance->int_urb)) 653 + int_urb = instance->int_urb; 654 + if (int_urb) 656 655 mod_timer(&instance->resubmit_timer, jiffies + msecs_to_jiffies(RESUBMIT_DELAY)); 657 656 } 658 657 ··· 762 759 struct usb_interface *cur_intf; 763 760 int i; 764 761 765 - for (i = 0; i < num_interfaces; i++) 766 - if ((cur_intf = usb_ifnum_to_if(usb_dev, i))) { 762 + for (i = 0; i < num_interfaces; i++) { 763 + cur_intf = usb_ifnum_to_if(usb_dev, i); 764 + if (cur_intf) { 767 765 usb_set_intfdata(cur_intf, NULL); 768 766 usb_driver_release_interface(&speedtch_usb_driver, cur_intf); 769 767 } 768 + } 770 769 } 771 770 772 771 static int speedtch_bind(struct usbatm_data *usbatm, ··· 792 787 return -ENODEV; 793 788 } 794 789 795 - if (!(data_intf = usb_ifnum_to_if(usb_dev, INTERFACE_DATA))) { 790 + data_intf = usb_ifnum_to_if(usb_dev, INTERFACE_DATA); 791 + if (!data_intf) { 796 792 usb_err(usbatm, "%s: data interface not found!\n", __func__); 797 793 return -ENODEV; 798 794 }