Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle the (weird) case when the power hook is called with a resume

Browse Source 
without a prior suspend.
This commit is contained in:
augustss 1999-10-17 15:31:00 +00:00
parent b9d51debd3
commit db3b140df8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/usb/uhci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uhci.c,v 1.60 1999/10/16 15:35:18 augustss Exp $ */ /* $NetBSD: uhci.c,v 1.61 1999/10/17 15:31:00 augustss Exp $ */
/* /*
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -526,6 +526,7 @@ uhci_power(why, v)
UHCICMD(sc, cmd | UHCI_CMD_EGSM); /* enter global suspend */ UHCICMD(sc, cmd | UHCI_CMD_EGSM); /* enter global suspend */
usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT); usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT);
sc->sc_suspend = why; sc->sc_suspend = why;
sc->sc_bus.use_polling--;
DPRINTF(("uhci_power: cmd=0x%x\n", UREAD2(sc, UHCI_CMD))); DPRINTF(("uhci_power: cmd=0x%x\n", UREAD2(sc, UHCI_CMD)));
} else { } else {
/* /*
@ -534,11 +535,10 @@ uhci_power(why, v)
* not restored them. * not restored them.
*/ */
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
if (sc->sc_bus.use_polling == 0) { if (sc->sc_suspend == PWR_RESUME)
printf("uhci_power: weird, polling not set.\n"); printf("uhci_power: weird, resume without suspend.\n");
sc->sc_bus.use_polling = 1;
}
#endif #endif
sc->sc_bus.use_polling++;
sc->sc_suspend = why; sc->sc_suspend = why;
if (cmd & UHCI_CMD_RS) if (cmd & UHCI_CMD_RS)
uhci_run(sc, 0); /* in case BIOS has started it */ uhci_run(sc, 0); /* in case BIOS has started it */