summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2008-06-21 21:35:28 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2008-06-21 21:35:28 +0000
commit06d28616f783fe971b575081a65611fd631ec04d (patch)
treec7dce45ddd6092877c0a861f2f9c1b2830132ba8
parentbb787f2bd9bbfc2bb587c0c559acfdc7dde02c81 (diff)
Oops. Forgot to actually change the retries in scsi_size() to SCSI_RETRIES.
-rw-r--r--sys/scsi/scsi_base.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 438da837e9c..84464563d93 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_base.c,v 1.127 2008/06/15 00:52:25 krw Exp $ */
+/* $OpenBSD: scsi_base.c,v 1.128 2008/06/21 21:35:27 krw Exp $ */
/* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */
/*
@@ -250,7 +250,7 @@ scsi_size(struct scsi_link *sc_link, int flags, u_int32_t *blksize)
* number of blocks
*/
error = scsi_scsi_cmd(sc_link, (struct scsi_generic *)&rc, sizeof(rc),
- (u_char *)&rdcap, sizeof(rdcap), 2, 20000, NULL,
+ (u_char *)&rdcap, sizeof(rdcap), SCSI_RETRIES, 20000, NULL,
flags | SCSI_DATA_IN);
if (error) {
SC_DEBUG(sc_link, SDEV_DB1, ("READ CAPACITY error (%#x)\n",
@@ -275,8 +275,8 @@ scsi_size(struct scsi_link *sc_link, int flags, u_int32_t *blksize)
_lto4b(sizeof(rdcap16), rc16.length);
error = scsi_scsi_cmd(sc_link, (struct scsi_generic *)&rc16,
- sizeof(rc16), (u_char *)&rdcap16, sizeof(rdcap16), 2, 20000, NULL,
- flags | SCSI_DATA_IN);
+ sizeof(rc16), (u_char *)&rdcap16, sizeof(rdcap16), SCSI_RETRIES,
+ 20000, NULL, flags | SCSI_DATA_IN);
if (error) {
SC_DEBUG(sc_link, SDEV_DB1, ("READ CAPACITY 16 error (%#x)\n",
error));