diff options
| author | imp <imp@FreeBSD.org> | 2005-09-08 17:51:24 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-09-08 17:51:24 +0000 |
| commit | 97862d715f8da90cde7e6992f2ec3e2315ca0a70 (patch) | |
| tree | 51401e81a99f90ce1bc61a6edbf5f22f7030db4a /sys | |
| parent | 8042878aa04bb7233ac953194ca1180929b4cc1a (diff) | |
| download | FreeBSD-src-97862d715f8da90cde7e6992f2ec3e2315ca0a70.zip FreeBSD-src-97862d715f8da90cde7e6992f2ec3e2315ca0a70.tar.gz | |
MFC: 1.188 and 1.189 remove bogus counter to allow ore than one card
to work in the system.
Approved by: re@ (scottl)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/wi/if_wi.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c index 0b01387..21e7e50 100644 --- a/sys/dev/wi/if_wi.c +++ b/sys/dev/wi/if_wi.c @@ -2431,15 +2431,10 @@ static int wi_cmd(struct wi_softc *sc, int cmd, int val0, int val1, int val2) { int i, s = 0; - static volatile int count = 0; if (sc->wi_gone) return (ENODEV); - if (count > 0) - panic("Hey partner, hold on there!"); - count++; - /* wait for the busy bit to clear */ for (i = sc->wi_cmd_count; i > 0; i--) { /* 500ms */ if (!(CSR_READ_2(sc, WI_COMMAND) & WI_CMD_BUSY)) @@ -2449,7 +2444,6 @@ wi_cmd(struct wi_softc *sc, int cmd, int val0, int val1, int val2) if (i == 0) { device_printf(sc->sc_dev, "wi_cmd: busy bit won't clear.\n" ); sc->wi_gone = 1; - count--; return(ETIMEDOUT); } @@ -2473,7 +2467,6 @@ wi_cmd(struct wi_softc *sc, int cmd, int val0, int val1, int val2) s = CSR_READ_2(sc, WI_STATUS); CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_CMD); if (s & WI_STAT_CMD_RESULT) { - count--; return(EIO); } break; @@ -2481,7 +2474,6 @@ wi_cmd(struct wi_softc *sc, int cmd, int val0, int val1, int val2) DELAY(WI_DELAY); } - count--; if (i == WI_TIMEOUT) { device_printf(sc->sc_dev, "timeout in wi_cmd 0x%04x; event status 0x%04x\n", cmd, s); |
