|
@@ -1142,10 +1142,14 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
|
|
|
|
|
|
if (!udev || udev->state == USB_STATE_NOTATTACHED) {
|
|
|
/* Tell hub_wq to disconnect the device or
|
|
|
- * check for a new connection
|
|
|
+ * check for a new connection or over current condition.
|
|
|
+ * Based on USB2.0 Spec Section 11.12.5,
|
|
|
+ * C_PORT_OVER_CURRENT could be set while
|
|
|
+ * PORT_OVER_CURRENT is not. So check for any of them.
|
|
|
*/
|
|
|
if (udev || (portstatus & USB_PORT_STAT_CONNECTION) ||
|
|
|
- (portstatus & USB_PORT_STAT_OVERCURRENT))
|
|
|
+ (portstatus & USB_PORT_STAT_OVERCURRENT) ||
|
|
|
+ (portchange & USB_PORT_STAT_C_OVERCURRENT))
|
|
|
set_bit(port1, hub->change_bits);
|
|
|
|
|
|
} else if (portstatus & USB_PORT_STAT_ENABLE) {
|