lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: rearrange code in usb_probe_interface

Browse Source 
This patch (as1322) reverses the two outcomes of an "if" statement in
usb_probe_interface(), to avoid an unnecessary level of indentation.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern
2010-01-08 12:56:04 -05:00
committed by Greg Kroah-Hartman
parent d837e219da
commit 0f3dda9f7f
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/core/driver.c
View File

@@ -274,17 +274,19 @@ static int usb_probe_interface(struct device *dev)
intf->needs_binding = 0; intf->needs_binding = 0;
if (usb_device_is_owned(udev)) if (usb_device_is_owned(udev))
return -ENODEV; return error;
if (udev->authorized == 0) { if (udev->authorized == 0) {
dev_err(&intf->dev, "Device is not authorized for usage\n"); dev_err(&intf->dev, "Device is not authorized for usage\n");
return -ENODEV; return error;
} }
id = usb_match_id(intf, driver->id_table); id = usb_match_id(intf, driver->id_table);
if (!id) if (!id)
id = usb_match_dynamic_id(intf, driver); id = usb_match_dynamic_id(intf, driver);
if (id) { if (!id)
return error;
dev_dbg(dev, "%s - got id\n", __func__); dev_dbg(dev, "%s - got id\n", __func__);
error = usb_autoresume_device(udev); error = usb_autoresume_device(udev);
@@ -309,7 +311,6 @@ static int usb_probe_interface(struct device *dev)
desc.bInterfaceNumber, 0); desc.bInterfaceNumber, 0);
if (error < 0) if (error < 0)
goto err; goto err;
intf->needs_altsetting0 = 0; intf->needs_altsetting0 = 0;
} }
@@ -319,11 +320,9 @@ static int usb_probe_interface(struct device *dev)
intf->condition = USB_INTERFACE_BOUND; intf->condition = USB_INTERFACE_BOUND;
usb_autosuspend_device(udev); usb_autosuspend_device(udev);
}
return error; return error;
err: err:
mark_quiesced(intf); mark_quiesced(intf);
intf->needs_remote_wakeup = 0; intf->needs_remote_wakeup = 0;
intf->condition = USB_INTERFACE_UNBOUND; intf->condition = USB_INTERFACE_UNBOUND;