summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2006-05-13 18:31:35 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2006-05-13 18:31:35 +0000
commitfe718319065d02ca7c4a1277d33e4142ad17786f (patch)
treeac7567f2ca020b8d2b238c1370fb9cc4eb3ec4ba /sys
parent8dafcfaa167e72e7dc3cec388e934aadb9595f96 (diff)
And the fallout from Manuel Pata's USB reader rumbles on ...
Fix the display of the device info for umass devices at lun 0 by passing the correct inquiry data to config_attach. i.e. not the inquiry data for lun 1, which we gratuitously probe to prevent USB card readers from 'helpfully' lying about who is where, but the inquiry data for lun 0 we have saved in sc_link->inqdata.
Diffstat (limited to 'sys')
-rw-r--r--sys/scsi/scsiconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 07ef3de9f96..fd237dcb4f5 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.101 2006/05/11 00:45:59 krw Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.102 2006/05/13 18:31:34 krw Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -705,7 +705,7 @@ scsi_probedev(scsi, inqbuflun0, target, lun)
sc_link->flags |= SDEV_REMOVABLE;
sa.sa_sc_link = sc_link;
- sa.sa_inqbuf = &inqbuf;
+ sa.sa_inqbuf = &sc_link->inqdata;
if ((cf = config_search(scsibussubmatch, (struct device *)scsi, &sa)) == 0) {
scsibusprint(&sa, scsi->sc_dev.dv_xname);