summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2002-03-09 23:37:10 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2002-03-09 23:37:10 +0000
commitd6db187a82ac6841f80863bf9c009a1b08934a9e (patch)
tree25f62bc95540d03898d3c74f7bfba311555ab993
parent9c78ea8323e22f7ffe199a395bae37e552048563 (diff)
Be less parochial and remember that others may need to use quirks!
Just set the SDEV_NOTAGS, SDEV_NOWIDE, SDEV_NOSYNC bits in quirks. DON'T zero all other bits that may have already been set. Noted (and fix tested) by lebel@.
-rw-r--r--sys/scsi/scsiconf.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 0336019bf2a..d3b176a2647 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.65 2002/02/28 00:02:48 krw Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.66 2002/03/09 23:37:09 krw Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -784,9 +784,11 @@ scsi_probedev(scsi, target, lun)
/*
* Tell drivers that are paying attention to avoid
* sync/wide/tags until INQUIRY data and quirks information
- * are available.
+ * are available. Since bits in quirks may have already been
+ * set by some drivers (e.g. NOLUNS for atapiscsi), just add
+ * NOTAGS, NOWIDE and NOSYNC.
*/
- sc_link->quirks = SDEV_NOSYNC | SDEV_NOWIDE | SDEV_NOTAGS;
+ sc_link->quirks |= SDEV_NOSYNC | SDEV_NOWIDE | SDEV_NOTAGS;
/*
* Ask the device what it is