Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82283
b: refs/heads/master
c: cd4cdc9
h: refs/heads/master
i:
  82281: 44414b4
  82279: 6cb148b
v: v3
  • Loading branch information
David Brownell authored and Greg Kroah-Hartman committed Feb 1, 2008
1 parent 7c491af commit daaebb6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b75be4abf18e9725766ed835f0d2cf201b52de7e
refs/heads/master: cd4cdc93ce04b562412df6c0cf25c564ab2522ac
6 changes: 1 addition & 5 deletions trunk/drivers/usb/host/ehci-hub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit daaebb6

Please sign in to comment.