summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2002-03-09 23:37:09 +0000
committerkrw <krw@openbsd.org>2002-03-09 23:37:09 +0000
commit788f29430ae9a22ba6fe2430ace192b52fcab913 (patch)
treef1af5b2038a90687c455587db6fa37cc897b77a0
parentCompletely rewritten keyboard detection mechanism. Instead of using the (diff)
downloadwireguard-openbsd-788f29430ae9a22ba6fe2430ace192b52fcab913.tar.xz
wireguard-openbsd-788f29430ae9a22ba6fe2430ace192b52fcab913.zip
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