From daaebb6503d8b3e1b9ead8fccf313017ebcec8ae Mon Sep 17 00:00:00 2001 From: David Brownell Date: Thu, 24 Jan 2008 12:39:43 -0800 Subject: [PATCH] --- yaml --- r: 82283 b: refs/heads/master c: cd4cdc93ce04b562412df6c0cf25c564ab2522ac h: refs/heads/master i: 82281: 44414b435c3db1a85ba288aa4061cad3728ffa11 82279: 6cb148bb48b04c8eba771e528a169b2c2c6e7e97 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-hub.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 449e5973f85b..80186ac980d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b75be4abf18e9725766ed835f0d2cf201b52de7e +refs/heads/master: cd4cdc93ce04b562412df6c0cf25c564ab2522ac diff --git a/trunk/drivers/usb/host/ehci-hub.c b/trunk/drivers/usb/host/ehci-hub.c index ccd88ae011c6..40e8240b7851 100644 --- a/trunk/drivers/usb/host/ehci-hub.c +++ b/trunk/drivers/usb/host/ehci-hub.c @@ -411,10 +411,8 @@ static int check_reset_complete ( u32 __iomem *status_reg, int port_status ) { - if (!(port_status & PORT_CONNECT)) { - ehci->reset_done [index] = 0; + if (!(port_status & PORT_CONNECT)) return port_status; - } /* if reset finished and it's still not enabled -- handoff */ if (!(port_status & PORT_PE)) { @@ -493,8 +491,6 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf) * controller by the user. */ - if (!(temp & PORT_CONNECT)) - ehci->reset_done [i] = 0; if ((temp & mask) != 0 || ((temp & PORT_RESUME) != 0 && time_after_eq(jiffies,