From 6ab2f19bc220712b2401ceda693a51b61ad1cd66 Mon Sep 17 00:00:00 2001 From: Hindin Joseph Date: Sun, 4 Nov 2012 22:50:08 +0200 Subject: [PATCH] --- yaml --- r: 338670 b: refs/heads/master c: c13b86a336d089f248293776a853252fbca15c26 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/generic.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3d1eff707169..b5c128d63658 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d94e16be70d34d139ec3c7882ed0283b5ac074d +refs/heads/master: c13b86a336d089f248293776a853252fbca15c26 diff --git a/trunk/drivers/usb/core/generic.c b/trunk/drivers/usb/core/generic.c index 69ecd3c92311..eff2010eb63f 100644 --- a/trunk/drivers/usb/core/generic.c +++ b/trunk/drivers/usb/core/generic.c @@ -47,6 +47,9 @@ int usb_choose_configuration(struct usb_device *udev) int insufficient_power = 0; struct usb_host_config *c, *best; + if (usb_device_is_owned(udev)) + return 0; + best = NULL; c = udev->config; num_configs = udev->descriptor.bNumConfigurations; @@ -160,9 +163,7 @@ static int generic_probe(struct usb_device *udev) /* Choose and set the configuration. This registers the interfaces * with the driver core and lets interface drivers bind to them. */ - if (usb_device_is_owned(udev)) - ; /* Don't configure if the device is owned */ - else if (udev->authorized == 0) + if (udev->authorized == 0) dev_err(&udev->dev, "Device is not authorized for usage\n"); else { c = usb_choose_configuration(udev);