diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 1999-10-07 18:56:10 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 1999-10-07 18:56:10 +0000 |
| commit | eea0f62c05c757dcf977bb7e64bfc153d05f5da5 (patch) | |
| tree | 9cd41f0be4346b8e2314b87d5b1f860a41bf4db3 /sys | |
| parent | 55a69f0422af8ffc4e14f73b8eec0750c40fae4a (diff) | |
| download | FreeBSD-src-eea0f62c05c757dcf977bb7e64bfc153d05f5da5.zip FreeBSD-src-eea0f62c05c757dcf977bb7e64bfc153d05f5da5.tar.gz | |
remove the use of uhci_reset to wake up the controller after
resume/suspend (->resume is broken again, will be fixed properly ASAP)
style fixes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/uhci_pci.c | 9 | ||||
| -rw-r--r-- | sys/pci/uhci_pci.c | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c index 1f40ebe..7dffa15 100644 --- a/sys/dev/usb/uhci_pci.c +++ b/sys/dev/usb/uhci_pci.c @@ -93,9 +93,7 @@ static const char *uhci_device_generic = "UHCI (generic) USB controller"; static int uhci_pci_suspend(device_t self) { - uhci_softc_t *sc; - - sc = device_get_softc(self); + uhci_softc_t *sc = device_get_softc(self); bus_generic_suspend(self); return 0; @@ -104,10 +102,11 @@ uhci_pci_suspend(device_t self) static int uhci_pci_resume(device_t self) { - uhci_softc_t *sc; + uhci_softc_t *sc = device_get_softc(self); - sc = device_get_softc(self); +#if 0 uhci_reset(sc); +#endif bus_generic_resume(self); return 0; diff --git a/sys/pci/uhci_pci.c b/sys/pci/uhci_pci.c index 1f40ebe..7dffa15 100644 --- a/sys/pci/uhci_pci.c +++ b/sys/pci/uhci_pci.c @@ -93,9 +93,7 @@ static const char *uhci_device_generic = "UHCI (generic) USB controller"; static int uhci_pci_suspend(device_t self) { - uhci_softc_t *sc; - - sc = device_get_softc(self); + uhci_softc_t *sc = device_get_softc(self); bus_generic_suspend(self); return 0; @@ -104,10 +102,11 @@ uhci_pci_suspend(device_t self) static int uhci_pci_resume(device_t self) { - uhci_softc_t *sc; + uhci_softc_t *sc = device_get_softc(self); - sc = device_get_softc(self); +#if 0 uhci_reset(sc); +#endif bus_generic_resume(self); return 0; |
