summaryrefslogtreecommitdiff
path: root/sys/dev/usb/umass_scsi.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2005-05-25 21:12:55 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2005-05-25 21:12:55 +0000
commitbb3a0804f60c718f9311dd17bcd96b8eccb700e1 (patch)
tree80958937b5d4812082ae49904fa22b9f6bec7be6 /sys/dev/usb/umass_scsi.c
parent96716667f92ebc98e6713d168685a87dcc3324b6 (diff)
PQUIK_NOMODESENSE no longer does anything, and PQUIRK_NOBIGMODESENSE was
defined to be 0. Expunge references. Null entries in quirks table will be removed later.
Diffstat (limited to 'sys/dev/usb/umass_scsi.c')
-rw-r--r--sys/dev/usb/umass_scsi.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c
index 537c17f5ed8..575f232f62b 100644
--- a/sys/dev/usb/umass_scsi.c
+++ b/sys/dev/usb/umass_scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umass_scsi.c,v 1.12 2005/05/14 23:36:26 krw Exp $ */
+/* $OpenBSD: umass_scsi.c,v 1.13 2005/05/25 21:12:54 krw Exp $ */
/* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -162,8 +162,7 @@ umass_scsi_setup(struct umass_softc *sc)
scbus->sc_link.adapter = &scbus->sc_adapter;
scbus->sc_link.adapter_softc = sc;
scbus->sc_link.openings = 1;
- scbus->sc_link.quirks |= PQUIRK_ONLYBIG | PQUIRK_NOMODESENSE |
- sc->sc_busquirks;
+ scbus->sc_link.quirks |= PQUIRK_ONLYBIG | sc->sc_busquirks;
return (scbus);
}
@@ -213,12 +212,6 @@ umass_scsi_cmd(struct scsi_xfer *xs)
cmd = xs->cmd;
cmdlen = xs->cmdlen;
- if (cmd->opcode == MODE_SENSE &&
- (sc_link->quirks & SDEV_NOMODESENSE)) {
- xs->error = XS_TIMEOUT;
- goto done;
- }
-
dir = DIR_NONE;
if (xs->datalen) {
switch (xs->flags & (SCSI_DATA_IN | SCSI_DATA_OUT)) {