From owner-p4-projects@FreeBSD.ORG  Mon Mar 16 08:15:06 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2B57E106568D; Mon, 16 Mar 2009 08:15:06 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D71BA1065687
	for <perforce@FreeBSD.org>; Mon, 16 Mar 2009 08:15:05 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C57498FC15
	for <perforce@FreeBSD.org>; Mon, 16 Mar 2009 08:15:05 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2G8F5XM065893
	for <perforce@FreeBSD.org>; Mon, 16 Mar 2009 08:15:05 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2G8F5YS065891
	for perforce@freebsd.org; Mon, 16 Mar 2009 08:15:05 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 16 Mar 2009 08:15:05 GMT
Message-Id: <200903160815.n2G8F5YS065891@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 159275 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Mar 2009 08:15:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=159275

Change 159275 by hselasky@hselasky_laptop001 on 2009/03/16 08:14:46

	
	USB UMASS: More patches from:
	Michael Gmelin

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#4 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#4 (text+ko) ====

@@ -849,7 +849,7 @@
 	},
 	{USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDE, RID_WILDCARD,
 		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
-		NO_INQUIRY | IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE
+		IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE
 	},
 	{USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE, RID_WILDCARD,
 		UMASS_PROTO_SCSI,
@@ -2026,7 +2026,7 @@
 
 		residue = UGETDW(sc->csw.dCSWDataResidue);
 
-		if (!residue) {
+		if ((!residue) || (sc->sc_quirks & IGNORE_RESIDUE)) {
 			residue = (sc->sc_transfer.data_len -
 			    sc->sc_transfer.actlen);
 		}