diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-04 19:22:20 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-04 19:22:20 +0000 |
| commit | dd0d7f6f905441c5d130d4169260091cbad63492 (patch) | |
| tree | d501ac6bc35e77cbb41ca61a69d206b06e17153f /sys | |
| parent | bcd6935cb01ba9cd0548025e8a64506dd9f7f1b0 (diff) | |
Slight fix to last, didn't see it quick enough.
Original log:
date: 1997/06/17 15:39:18; author: bouyer; state: Exp; lines: +3 -2
wdcreset should return errors, even if !VERBOSE !
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/isa/wdc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/isa/wdc.c b/sys/dev/isa/wdc.c index 69720b8d9cf..70a141582ff 100644 --- a/sys/dev/isa/wdc.c +++ b/sys/dev/isa/wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc.c,v 1.20 1997/07/04 19:17:56 downsj Exp $ */ +/* $OpenBSD: wdc.c,v 1.21 1997/07/04 19:22:19 downsj Exp $ */ /* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* @@ -1578,8 +1578,9 @@ wdcreset(wdc, mode) (void) bus_space_read_1(iot, ioh, wd_error); bus_space_write_1(iot, ioh, wd_ctlr, WDCTL_4BIT); - if ((wait_for_unbusy(wdc) < 0) && mode != WDCRESET_SILENT) { - printf("%s: reset failed\n", wdc->sc_dev.dv_xname); + if (wait_for_unbusy(wdc) < 0) { + if (mode != WDCRESET_SILENT) + printf("%s: reset failed\n", wdc->sc_dev.dv_xname); return 1; } |