diff options
-rw-r--r-- | drivers/usb/core/hub.c | 6 | ||||
-rw-r--r-- | include/linux/usb/gadget.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index d20cb545a6e4..60a8f55a0cc7 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -1407,7 +1407,11 @@ fail: | |||
1407 | 1407 | ||
1408 | 1408 | ||
1409 | /** | 1409 | /** |
1410 | * Similar to usb_disconnect() | 1410 | * usb_deauthorize_device - deauthorize a device (usbcore-internal) |
1411 | * @usb_dev: USB device | ||
1412 | * | ||
1413 | * Move the USB device to a very basic state where interfaces are disabled | ||
1414 | * and the device is in fact unconfigured and unusable. | ||
1411 | * | 1415 | * |
1412 | * We share a lock (that we have) with device_del(), so we need to | 1416 | * We share a lock (that we have) with device_del(), so we need to |
1413 | * defer its call. | 1417 | * defer its call. |
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index 46705e91573d..c1527c2ef3cb 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h | |||
@@ -481,7 +481,7 @@ static inline void *get_gadget_data (struct usb_gadget *gadget) | |||
481 | 481 | ||
482 | /** | 482 | /** |
483 | * gadget_is_dualspeed - return true iff the hardware handles high speed | 483 | * gadget_is_dualspeed - return true iff the hardware handles high speed |
484 | * @gadget: controller that might support both high and full speeds | 484 | * @g: controller that might support both high and full speeds |
485 | */ | 485 | */ |
486 | static inline int gadget_is_dualspeed(struct usb_gadget *g) | 486 | static inline int gadget_is_dualspeed(struct usb_gadget *g) |
487 | { | 487 | { |
@@ -497,7 +497,7 @@ static inline int gadget_is_dualspeed(struct usb_gadget *g) | |||
497 | 497 | ||
498 | /** | 498 | /** |
499 | * gadget_is_otg - return true iff the hardware is OTG-ready | 499 | * gadget_is_otg - return true iff the hardware is OTG-ready |
500 | * @gadget: controller that might have a Mini-AB connector | 500 | * @g: controller that might have a Mini-AB connector |
501 | * | 501 | * |
502 | * This is a runtime test, since kernels with a USB-OTG stack sometimes | 502 | * This is a runtime test, since kernels with a USB-OTG stack sometimes |
503 | * run on boards which only have a Mini-B (or Mini-A) connector. | 503 | * run on boards which only have a Mini-B (or Mini-A) connector. |