===================================================================
RCS file: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/usb/usbdevs,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- src/sys/dev/usb/usbdevs	2006/01/26 00:35:54	1.250
+++ src/sys/dev/usb/usbdevs	2006/01/30 20:27:44	1.251
@@ -1,4 +1,4 @@
-$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/usb/usbdevs,v 1.250 2006/01/26 00:35:54 flz Exp $
+$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/usb/usbdevs,v 1.251 2006/01/30 20:27:44 flz Exp $
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-
@@ -910,6 +910,7 @@ product GENESYS GL650		0x0604	GL650 Hub
 product GENESYS GL641USB	0x0700	GL641USB CompactFlash Card Reader
 product GENESYS GL641USB2IDE_2	0x0701	GL641USB USB-IDE Bridge No 2
 product GENESYS GL641USB2IDE	0x0702	GL641USB USB-IDE Bridge
+product GENESYS GL641USB_2	0x0760	GL641USB 6-in-1 Card Reader
 
 /* GIGABYTE products */
 product GIGABYTE GNBR402W	0x8002	GN-BR402W
===================================================================
RCS file: /usr/local/www/cvsroot/FreeBSD/src/sys/cam/scsi/scsi_da.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- src/sys/cam/scsi/scsi_da.c	2006/01/26 00:35:53	1.185
+++ src/sys/cam/scsi/scsi_da.c	2006/01/30 20:27:44	1.186
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/cam/scsi/scsi_da.c,v 1.185 2006/01/26 00:35:53 flz Exp $");
+__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/cam/scsi/scsi_da.c,v 1.186 2006/01/30 20:27:44 flz Exp $");
 
 #include <sys/param.h>
 
@@ -425,6 +425,14 @@ static struct da_quirk_entry da_quirk_ta
 		 * PR: usb/75578, usb/72344, usb/65436 
 		 */
 		{T_DIRECT, SIP_MEDIA_REMOVABLE, "*" , "USB DISK*",
+		"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+	},
+	{
+		/*
+		 * Genesys 6-in-1 Card Reader
+		 * No PR, reported by anders
+		 */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic*", "STORAGE DEVICE*",
 		"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
 	},
 };
===================================================================
RCS file: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/usb/umass.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- src/sys/dev/usb/umass.c	2006/01/26 01:23:29	1.130
+++ src/sys/dev/usb/umass.c	2006/01/30 20:27:44	1.131
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/usb/umass.c,v 1.130 2006/01/26 01:23:29 flz Exp $
+ *	$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/usb/umass.c,v 1.131 2006/01/30 20:27:44 flz Exp $
  *	$NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
  */
 
@@ -339,6 +339,10 @@ Static struct umass_devdescr_t umass_dev
 	{ USB_VENDOR_GENESYS,  USB_PRODUCT_GENESYS_GL641USB, RID_WILDCARD,
 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 	  FORCE_SHORT_INQUIRY | NO_START_STOP | IGNORE_RESIDUE
+	},
+	{ USB_VENDOR_GENESYS,  USB_PRODUCT_GENESYS_GL641USB_2, RID_WILDCARD,
+	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+	  WRONG_CSWSIG
 	},
 	{ USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DVDCAM_USB, RID_WILDCARD,
 	  UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I,