diff options
| author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2006-08-14 00:28:08 +0000 |
|---|---|---|
| committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2006-08-14 00:28:08 +0000 |
| commit | 60d349f288eb853474c709137ab21b9cb4683b19 (patch) | |
| tree | 42c94a50421d0b4f2ae644e4643deaba01824108 /sys | |
| parent | d6ec5bff182554d7f0f3626cfb6a2ec035e6766b (diff) | |
Fix mismerge in PWR_RESUME path.
ok dlg@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/ehci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 4b0add95798..1b348656298 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.62 2006/08/06 12:12:44 pascoe Exp $ */ +/* $OpenBSD: ehci.c,v 1.63 2006/08/14 00:28:07 pascoe Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -1012,10 +1012,11 @@ ehci_power(int why, void *v) hcr = 0; for (i = 1; i <= sc->sc_noport; i++) { cmd = EOREAD4(sc, EHCI_PORTSC(i)); - if ((cmd & (EHCI_PS_PO|EHCI_PS_SUSP)) == EHCI_PS_SUSP) + if ((cmd & (EHCI_PS_PO|EHCI_PS_SUSP)) == EHCI_PS_SUSP) { EOWRITE4(sc, EHCI_PORTSC(i), cmd | EHCI_PS_FPR); - hcr = 1; + hcr = 1; + } } if (hcr) { |