diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-06-10 01:38:47 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-06-10 01:38:47 +0000 |
| commit | be46ee5a31697e2103b5df0ce3f20c244b09f6f4 (patch) | |
| tree | 9e3429e53041eb1e8a64cc6213256849c7a913c7 /sys | |
| parent | 66bf82ce661428536abf3368e827db396041da1b (diff) | |
Do not set the dying flag in wdc_wait_for_status, since there is at
least one chip sii3112 or sii314, owned by henning) that spuriously
returns failure. This is only backing out one of the dying cases.
As well, I have found one other case where attempts are made to advance
IO even after obvious failure. I suspect that I should find that issue
next.
discussed with henning, kettenis, and matthew
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/wdc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c index aaa97885fc5..23b15606e0a 100644 --- a/sys/dev/ic/wdc.c +++ b/sys/dev/ic/wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc.c,v 1.118 2011/05/25 03:26:20 matthew Exp $ */ +/* $OpenBSD: wdc.c,v 1.119 2011/06/10 01:38:46 deraadt Exp $ */ /* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -1092,9 +1092,6 @@ wdc_wait_for_status(struct channel_softc *chp, int mask, int bits, int timeout) chp->ch_status = status = CHP_READ_REG(chp, wdr_status); WDC_LOG_STATUS(chp, chp->ch_status); - } else { - chp->dying = 1; - return -1; } } if ((status & WDCS_BSY) == 0 && (status & mask) == bits) |