summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannken <hannken@cvs.openbsd.org>1996-02-20 12:07:05 +0000
committerhannken <hannken@cvs.openbsd.org>1996-02-20 12:07:05 +0000
commit17a01dc9495d9e83dad0dc0e9ae07171bb9ff5fc (patch)
treec3c822b28c1e3572ff32e15a91076ba75e13c866
parent096f158c012827f58fdc348c93772f294bff128a (diff)
Fix disk_unbusy panic (from NetBSD)
-rw-r--r--sys/arch/i386/isa/fd.c5
-rw-r--r--sys/dev/isa/fd.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/i386/isa/fd.c b/sys/arch/i386/isa/fd.c
index 90ac3987c1d..78d8ff0c347 100644
--- a/sys/arch/i386/isa/fd.c
+++ b/sys/arch/i386/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.82 1996/01/07 22:02:28 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.84 1996/02/10 18:31:13 thorpej Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum.
@@ -1109,8 +1109,7 @@ fdcretry(fdc)
switch (fdc->sc_errors) {
case 0:
/* try again */
- fdc->sc_state = SEEKCOMPLETE;
- disk_busy(&fd->sc_dk);
+ fdc->sc_state = DOSEEK;
break;
case 1: case 2: case 3:
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 90ac3987c1d..78d8ff0c347 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.82 1996/01/07 22:02:28 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.84 1996/02/10 18:31:13 thorpej Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum.
@@ -1109,8 +1109,7 @@ fdcretry(fdc)
switch (fdc->sc_errors) {
case 0:
/* try again */
- fdc->sc_state = SEEKCOMPLETE;
- disk_busy(&fd->sc_dk);
+ fdc->sc_state = DOSEEK;
break;
case 1: case 2: case 3: