diff options
| author | joerg <joerg@FreeBSD.org> | 1999-07-29 11:27:33 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 1999-07-29 11:27:33 +0000 |
| commit | 8b7dc7c5cff231998de3268e8f1f566373c07e2f (patch) | |
| tree | bd4411df16936828d2c3feb837d745eb4ff2a16b /sys | |
| parent | d291b1f656f92ec4b3584a876526262eb40a9a4e (diff) | |
| download | FreeBSD-src-8b7dc7c5cff231998de3268e8f1f566373c07e2f.zip FreeBSD-src-8b7dc7c5cff231998de3268e8f1f566373c07e2f.tar.gz | |
Revert rev 1.149. Bruce convinced me that the problem already disappeared
by the fix in rev 1.120, which i wasn't immediately aware of.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/fdc/fdc.c | 6 | ||||
| -rw-r--r-- | sys/isa/fd.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index eaa5b0f..43b0274 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.149 1999/07/21 12:19:44 joerg Exp $ + * $Id: fd.c,v 1.150 1999/07/29 01:02:55 mdodd Exp $ * */ @@ -2132,9 +2132,6 @@ retrier(struct fdc_data *fdc) fail: { dev_t sav_b_dev = bp->b_dev; - - if (fdc->fd == 0) - goto bogus; /* Trick diskerr */ bp->b_dev = makedev(major(bp->b_dev), (FDUNIT(minor(bp->b_dev))<<3)|RAW_PART); @@ -2168,7 +2165,6 @@ retrier(struct fdc_data *fdc) DEVSTAT_WRITE); fdc->fd->skip = 0; biodone(bp); - bogus: fdc->state = FINDWORK; fdc->flags |= FDC_NEEDS_RESET; fdc->fd = (fd_p) 0; diff --git a/sys/isa/fd.c b/sys/isa/fd.c index eaa5b0f..43b0274 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.149 1999/07/21 12:19:44 joerg Exp $ + * $Id: fd.c,v 1.150 1999/07/29 01:02:55 mdodd Exp $ * */ @@ -2132,9 +2132,6 @@ retrier(struct fdc_data *fdc) fail: { dev_t sav_b_dev = bp->b_dev; - - if (fdc->fd == 0) - goto bogus; /* Trick diskerr */ bp->b_dev = makedev(major(bp->b_dev), (FDUNIT(minor(bp->b_dev))<<3)|RAW_PART); @@ -2168,7 +2165,6 @@ retrier(struct fdc_data *fdc) DEVSTAT_WRITE); fdc->fd->skip = 0; biodone(bp); - bogus: fdc->state = FINDWORK; fdc->flags |= FDC_NEEDS_RESET; fdc->fd = (fd_p) 0; |
