From 82799545e3cc47deede202bebb3413cdc327b52c Mon Sep 17 00:00:00 2001 From: Nick Hibma Date: Thu, 7 Oct 1999 18:56:10 +0000 Subject: [PATCH] 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 --- sys/dev/usb/uhci_pci.c | 9 ++++----- 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 1f40ebe7b4e3..7dffa15f6db5 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 1f40ebe7b4e3..7dffa15f6db5 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;