summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-09-24 09:29:34 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-09-24 09:29:34 +0000
commitba8a9a9f4080f26edaab63d678c2ddef801182de (patch)
treee58c899c60f92b74c8d318f432534c1b57a2e37e /sys/dev
parent098d97a65eeb611e0278b982231a7d5282ab0fcf (diff)
do not delay excessively on pcmcia; from peter
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/elink3.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index e7a4a0eb4c0..e4d71fcff9f 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -969,11 +969,6 @@ epbusyeeprom(sc)
bus_io_handle_t ioh = sc->sc_ioh;
int i = 100, j;
- if (sc->bustype == EP_BUS_PCMCIA) {
- delay(1000);
- return 0;
- }
-
while (i--) {
j = bus_io_read_2(bc, ioh, EP_W0_EEPROM_COMMAND);
if (j & EEPROM_BUSY)
@@ -986,7 +981,7 @@ epbusyeeprom(sc)
sc->sc_dev.dv_xname);
return (1);
}
- if (j & EEPROM_TST_MODE) {
+ if (sc->bustype != EP_BUS_PCMCIA && j & EEPROM_TST_MODE) {
printf("\n%s: erase pencil mark, or disable plug-n-play mode!\n",
sc->sc_dev.dv_xname);
return (1);