git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[sfrench/cifs-2.6.git]
/
drivers
/
usb
/
core
/
hub.c
diff --git
a/drivers/usb/core/hub.c
b/drivers/usb/core/hub.c
index d20cb545a6e4fd0bbc67634251f666d4a0eedfe9..13b326a13377051e54cf7824adffad8ef21fd1c0 100644
(file)
--- a/
drivers/usb/core/hub.c
+++ b/
drivers/usb/core/hub.c
@@
-335,7
+335,7
@@
static void kick_khubd(struct usb_hub *hub)
to_usb_interface(hub->intfdev)->pm_usage_cnt = 1;
spin_lock_irqsave(&hub_event_lock, flags);
to_usb_interface(hub->intfdev)->pm_usage_cnt = 1;
spin_lock_irqsave(&hub_event_lock, flags);
- if (!hub->disconnected & list_empty(&hub->event_list)) {
+ if (!hub->disconnected &
&
list_empty(&hub->event_list)) {
list_add_tail(&hub->event_list, &hub_event_list);
wake_up(&khubd_wait);
}
list_add_tail(&hub->event_list, &hub_event_list);
wake_up(&khubd_wait);
}
@@
-1407,7
+1407,11
@@
fail:
/**
/**
- * 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.
*
* We share a lock (that we have) with device_del(), so we need to
* defer its call.
@@
-2866,10
+2870,9
@@
static int hub_thread(void *__unused)
set_freezable();
do {
hub_events();
set_freezable();
do {
hub_events();
- wait_event_
interrupti
ble(khubd_wait,
+ wait_event_
freeza
ble(khubd_wait,
!list_empty(&hub_event_list) ||
kthread_should_stop());
!list_empty(&hub_event_list) ||
kthread_should_stop());
- try_to_freeze();
} while (!kthread_should_stop() || !list_empty(&hub_event_list));
pr_debug("%s: khubd exiting\n", usbcore_name);
} while (!kthread_should_stop() || !list_empty(&hub_event_list));
pr_debug("%s: khubd exiting\n", usbcore_name);