Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix condition where disk_unbusy may not get called

This commit is contained in:
explorer 1996-08-13 08:31:31 +00:00
parent 1cc7b834e4
commit 5c3b7a7213
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/scsipi/cd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd.c,v 1.92 1996/05/05 19:52:50 christos Exp $ */ /* $NetBSD: cd.c,v 1.93 1996/08/13 08:31:31 explorer Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -586,8 +586,10 @@ cdstart(v)
if (scsi_scsi_cmd(sc_link, cmdp, cmdlen, if (scsi_scsi_cmd(sc_link, cmdp, cmdlen,
(u_char *) bp->b_data, bp->b_bcount, (u_char *) bp->b_data, bp->b_bcount,
CDRETRIES, 30000, bp, SCSI_NOSLEEP | CDRETRIES, 30000, bp, SCSI_NOSLEEP |
((bp->b_flags & B_READ) ? SCSI_DATA_IN : SCSI_DATA_OUT))) ((bp->b_flags & B_READ) ? SCSI_DATA_IN : SCSI_DATA_OUT))) {
disk_unbusy(&cd->sc_dk, 0);
printf("%s: not queued", cd->sc_dev.dv_xname); printf("%s: not queued", cd->sc_dev.dv_xname);
}
} }
} }

6
sys/scsi/cd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd.c,v 1.92 1996/05/05 19:52:50 christos Exp $ */ /* $NetBSD: cd.c,v 1.93 1996/08/13 08:31:31 explorer Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -586,8 +586,10 @@ cdstart(v)
if (scsi_scsi_cmd(sc_link, cmdp, cmdlen, if (scsi_scsi_cmd(sc_link, cmdp, cmdlen,
(u_char *) bp->b_data, bp->b_bcount, (u_char *) bp->b_data, bp->b_bcount,
CDRETRIES, 30000, bp, SCSI_NOSLEEP | CDRETRIES, 30000, bp, SCSI_NOSLEEP |
((bp->b_flags & B_READ) ? SCSI_DATA_IN : SCSI_DATA_OUT))) ((bp->b_flags & B_READ) ? SCSI_DATA_IN : SCSI_DATA_OUT))) {
disk_unbusy(&cd->sc_dk, 0);
printf("%s: not queued", cd->sc_dev.dv_xname); printf("%s: not queued", cd->sc_dev.dv_xname);
}
} }
} }