From 71a12afc8d0729f48f0022122807c7e8d0b15ab1 Mon Sep 17 00:00:00 2001 From: matthew Date: Thu, 22 Jul 2010 05:21:58 +0000 Subject: [PATCH] In scsi_inquire_vpd(), actually just return EJUSTRETURN when dealing with UMASS devices. Fixes scsi_scsi_cmd() removal regression. ok dlg@ --- sys/scsi/scsi_base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 1519ab24bc9..cd1c23eda92 100644 --- 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) -- 2.20.1