Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3383ee4c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
parent b87f5671

drivers/usb/atm/speedtch.c

+12 −6
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ static int speedtch_upload_firmware(struct speedtch_instance_data *instance, 


	usb_dbg(usbatm, "%s entered\n", __func__);



	if (!(buffer = (unsigned char *)__get_free_page(GFP_KERNEL))) {

	buffer = (unsigned char *)__get_free_page(GFP_KERNEL);

	if (!buffer) {

		ret = -ENOMEM;

		usb_dbg(usbatm, "%s: no memory for buffer!\n", __func__);

		goto out;
@@ -638,7 +639,8 @@ static void speedtch_handle_int(struct urb *int_urb) 
		goto fail;

	}



	if ((int_urb = instance->int_urb)) {

	int_urb = instance->int_urb;

	if (int_urb) {

		ret = usb_submit_urb(int_urb, GFP_ATOMIC);

		schedule_work(&instance->status_check_work);

		if (ret < 0) {
@@ -650,7 +652,8 @@ static void speedtch_handle_int(struct urb *int_urb) 
	return;



fail:

	if ((int_urb = instance->int_urb))

	int_urb = instance->int_urb;

	if (int_urb)

		mod_timer(&instance->resubmit_timer, jiffies + msecs_to_jiffies(RESUBMIT_DELAY));

}
@@ -759,12 +762,14 @@ static void speedtch_release_interfaces(struct usb_device *usb_dev, 
	struct usb_interface *cur_intf;

	int i;



	for (i = 0; i < num_interfaces; i++)

		if ((cur_intf = usb_ifnum_to_if(usb_dev, i))) {

	for (i = 0; i < num_interfaces; i++) {

		cur_intf = usb_ifnum_to_if(usb_dev, i);

		if (cur_intf) {

			usb_set_intfdata(cur_intf, NULL);

			usb_driver_release_interface(&speedtch_usb_driver, cur_intf);

		}

	}

}



static int speedtch_bind(struct usbatm_data *usbatm,

			 struct usb_interface *intf,
@@ -787,7 +792,8 @@ static int speedtch_bind(struct usbatm_data *usbatm, 
		return -ENODEV;

	}



	if (!(data_intf = usb_ifnum_to_if(usb_dev, INTERFACE_DATA))) {

	data_intf = usb_ifnum_to_if(usb_dev, INTERFACE_DATA);

	if (!data_intf) {

		usb_err(usbatm, "%s: data interface not found!\n", __func__);

		return -ENODEV;

	}