In scsi_inquire_vpd(), actually just return EJUSTRETURN when dealing

with UMASS devices.  Fixes scsi_scsi_cmd() removal regression.

ok dlg@

diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 1519ab2..cd1c23e 100644 (file)
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: scsi_base.c,v 1.184 2010/07/22 00:31:06 krw Exp $     */
+/*     $OpenBSD: scsi_base.c,v 1.185 2010/07/22 05:21:58 matthew Exp $ */
 /*     $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $   */
 
 /*
@@ -812,7 +812,7 @@ scsi_inquire_vpd(struct scsi_link *sc_link, void *buf, u_int buflen,
        int error;
 
        if (sc_link->flags & SDEV_UMASS)
-               error = EJUSTRETURN;
+               return (EJUSTRETURN);
 
        xs = scsi_xs_get(sc_link, flags | SCSI_DATA_IN | SCSI_SILENT);
        if (xs == NULL)