Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 67823
b: refs/heads/master
c: f8a3746
h: refs/heads/master
i:
  67821: d4d34bb
  67819: 40004e5
  67815: 5919898
  67807: 81389ad
v: v3
  • Loading branch information
Inaky Perez-Gonzalez authored and Greg Kroah-Hartman committed Oct 12, 2007
1 parent ff82830 commit ba3cfbb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 72230abb21349cda54d6cce0d6fd325c023b958e
refs/heads/master: f8a374648b58e5cfa14447eca866aed14a4fbfa8
19 changes: 11 additions & 8 deletions trunk/drivers/usb/core/generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,20 @@ 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.
*/
c = choose_configuration(udev);
if (c >= 0) {
err = usb_set_configuration(udev, c);
if (err) {
dev_err(&udev->dev, "can't set config #%d, error %d\n",
if (udev->authorized == 0)
dev_err(&udev->dev, "Device is not authorized for usage\n");
else {
c = choose_configuration(udev);
if (c >= 0) {
err = usb_set_configuration(udev, c);
if (err) {
dev_err(&udev->dev, "can't set config #%d, error %d\n",
c, err);
/* This need not be fatal. The user can try to
* set other configurations. */
/* This need not be fatal. The user can try to
* set other configurations. */
}
}
}

/* USB device state == configured ... usable */
usb_notify_add_device(udev);

Expand Down

0 comments on commit ba3cfbb

Please sign in to comment.