From 650b962d2d56582b2644e8b20aac72b3444079e4 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 15 Oct 2007 17:30:02 -0700 Subject: [PATCH] --- yaml --- r: 69559 b: refs/heads/master c: fd39c86b3d8910fbafe41207135c1d72bc895614 h: refs/heads/master i: 69557: 9d112e1c20f0c6ff2dc81fca4fdda652d472f60d 69555: 0bf2f581773b45f009cea951d19ac82d35d8bd4a 69551: 9208d8ce648594c5d56132ee86fdfb443de9731b v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/hub.c | 6 +++++- trunk/include/linux/usb/gadget.h | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a0eea8198907..1d64b5077bec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5d0e6a0d225c03b59a0a70f940e439085235ba2 +refs/heads/master: fd39c86b3d8910fbafe41207135c1d72bc895614 diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c index d20cb545a6e4..60a8f55a0cc7 100644 --- a/trunk/drivers/usb/core/hub.c +++ b/trunk/drivers/usb/core/hub.c @@ -1407,7 +1407,11 @@ int usb_new_device(struct usb_device *udev) /** - * Similar to usb_disconnect() + * usb_deauthorize_device - deauthorize a device (usbcore-internal) + * @usb_dev: USB device + * + * Move the USB device to a very basic state where interfaces are disabled + * and the device is in fact unconfigured and unusable. * * We share a lock (that we have) with device_del(), so we need to * defer its call. diff --git a/trunk/include/linux/usb/gadget.h b/trunk/include/linux/usb/gadget.h index 46705e91573d..c1527c2ef3cb 100644 --- a/trunk/include/linux/usb/gadget.h +++ b/trunk/include/linux/usb/gadget.h @@ -481,7 +481,7 @@ static inline void *get_gadget_data (struct usb_gadget *gadget) /** * gadget_is_dualspeed - return true iff the hardware handles high speed - * @gadget: controller that might support both high and full speeds + * @g: controller that might support both high and full speeds */ static inline int gadget_is_dualspeed(struct usb_gadget *g) { @@ -497,7 +497,7 @@ static inline int gadget_is_dualspeed(struct usb_gadget *g) /** * gadget_is_otg - return true iff the hardware is OTG-ready - * @gadget: controller that might have a Mini-AB connector + * @g: controller that might have a Mini-AB connector * * This is a runtime test, since kernels with a USB-OTG stack sometimes * run on boards which only have a Mini-B (or Mini-A) connector.