aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/ed
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2005-02-22 03:37:04 +0000
committerWarner Losh <imp@FreeBSD.org>2005-02-22 03:37:04 +0000
commitb093da40fb32a6039b7ba7b53920fbe74db6c9a0 (patch)
tree24eda414556b47f95ecfa87de11bb927f8ea3587 /sys/dev/ed
parent943b456e6a1112dc4d880b67397f8fcb1b8e3537 (diff)
Notes
Diffstat (limited to 'sys/dev/ed')
-rw-r--r--sys/dev/ed/if_ed_wd80x3.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/ed/if_ed_wd80x3.c b/sys/dev/ed/if_ed_wd80x3.c
index 04943587bc42..fe23c87758a2 100644
--- a/sys/dev/ed/if_ed_wd80x3.c
+++ b/sys/dev/ed/if_ed_wd80x3.c
@@ -418,12 +418,6 @@ ed_probe_WD80x3_generic(device_t dev, int flags, uint16_t *intr_vals[])
sc->cr_proto = 0;
}
- error = ed_clear_memory(dev);
- if (error) {
- ed_disable_16bit_access(sc);
- return (error);
- }
-
/*
* Disable 16bit access to shared memory - we leave it
* disabled so that 1) machines reboot properly when the board
@@ -432,8 +426,9 @@ ed_probe_WD80x3_generic(device_t dev, int flags, uint16_t *intr_vals[])
* shared memory. and 2) so that other 8 bit devices with
* shared memory can be used in this 128k region, too.
*/
+ error = ed_clear_memory(dev);
ed_disable_16bit_access(sc);
- return (0);
+ return (error);
}
int