Commit 0f3dda9f authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

USB: rearrange code in usb_probe_interface

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d837e219
...@@ -274,17 +274,19 @@ static int usb_probe_interface(struct device *dev) ...@@ -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) ...@@ -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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment