From owner-svn-src-all@FreeBSD.ORG  Tue Oct 30 16:56:17 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 43579B00;
 Tue, 30 Oct 2012 16:56:17 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 2B0408FC17;
 Tue, 30 Oct 2012 16:56:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9UGuHD8033840;
 Tue, 30 Oct 2012 16:56:17 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9UGuGKT033838;
 Tue, 30 Oct 2012 16:56:16 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201210301656.q9UGuGKT033838@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 30 Oct 2012 16:56:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242364 - head/sys/dev/usb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Oct 2012 16:56:17 -0000

Author: hselasky
Date: Tue Oct 30 16:56:16 2012
New Revision: 242364
URL: http://svn.freebsd.org/changeset/base/242364

Log:
  If a USB mass storage device doesn't respond properly
  to the initial SCSI INQUIRY command, enable all quirks.
  This fixes detection of some Transcend TS2GUFM devices.
  
  MFC after:	1 week
  Reported by:	Michael Dexter

Modified:
  head/sys/dev/usb/usb_msctest.c

Modified: head/sys/dev/usb/usb_msctest.c
==============================================================================
--- head/sys/dev/usb/usb_msctest.c	Tue Oct 30 15:25:23 2012	(r242363)
+++ head/sys/dev/usb/usb_msctest.c	Tue Oct 30 16:56:16 2012	(r242364)
@@ -664,8 +664,11 @@ usb_msc_auto_quirk(struct usb_device *ud
 			if (sid_type == 0x00)
 				is_no_direct = 0;
 			break;
-		} else if (err != ERR_CSW_FAILED)
-			break;	/* non retryable error */
+		} else if (err != ERR_CSW_FAILED) {
+			DPRINTF("Device is not responding "
+			    "properly to SCSI INQUIRY command.\n");
+			goto error;	/* non retryable error */
+		}
 		usb_pause_mtx(NULL, hz);
 	}