From ef87688230f307993ca1df3a4ef4c1729b42dc68 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@gentoo.org>
Date: Thu, 29 Sep 2005 00:14:21 +0100
Subject: [PATCH] --- yaml --- r: 10785 b: refs/heads/master c:
 a8798533c1f876b97566588cf2bf52458cb4a35d h: refs/heads/master i:   10783:
 ffc12a2a0ff8962c080a3e679ab779727e19ff30 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/usb/storage/shuttle_usbat.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a60305bb9084..91d58e473dab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d40ece1dc8dcc89ab921755cbc93a5cfb46d0766
+refs/heads/master: a8798533c1f876b97566588cf2bf52458cb4a35d
diff --git a/trunk/drivers/usb/storage/shuttle_usbat.c b/trunk/drivers/usb/storage/shuttle_usbat.c
index 356342c6e7a2..bd448d6c3185 100644
--- a/trunk/drivers/usb/storage/shuttle_usbat.c
+++ b/trunk/drivers/usb/storage/shuttle_usbat.c
@@ -855,15 +855,15 @@ static int usbat_identify_device(struct us_data *us,
  	if (rc != USB_STOR_XFER_GOOD)
  		return USB_STOR_TRANSPORT_ERROR;
 
-	// Check for error bit
-	if (status & 0x01) {
-		 // Device is a CompactFlash reader/writer
-		US_DEBUGP("usbat_identify_device: Detected Flash reader/writer\n");
-		info->devicetype = USBAT_DEV_FLASH;
-	} else {
+	// Check for error bit, or if the command 'fell through'
+	if (status == 0xA1 || !(status & 0x01)) {
 		// Device is HP 8200
 		US_DEBUGP("usbat_identify_device: Detected HP8200 CDRW\n");
 		info->devicetype = USBAT_DEV_HP8200;
+	} else {
+		// Device is a CompactFlash reader/writer
+		US_DEBUGP("usbat_identify_device: Detected Flash reader/writer\n");
+		info->devicetype = USBAT_DEV_FLASH;
 	}
 
 	return USB_STOR_TRANSPORT_GOOD;