Datafab and Lexar Jumpshot USB driver updates

diff -Naur linux-orig/drivers/usb/storage/datafab.c linux-2.4.17/drivers/usb/storage/datafab.c
@@ -10,6 +10,7 @@
  *   which I used as a template for this driver.
  *   Some bugfixes and scatter-gather code by Gregory P. Smith 
  *   ([email protected])
+ *   Fix for media change by Joerg Schneider ([email protected])
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

@@ -801,6 +802,23 @@
 		return USB_STOR_TRANSPORT_GOOD;
 	}
 
+	if (srb->cmnd[0] == START_STOP) {
+		/* this is used by sd.c'check_scsidisk_media_change to detect
+		   media change */
+		US_DEBUGP("datafab_transport:  START_STOP.\n");
+		/* the first datafab_id_device after a media change returns
+		   an error (determined experimentally) */
+		rc = datafab_id_device(us, info);
+		if (rc == USB_STOR_TRANSPORT_GOOD) {
+		  info->sense_key = NO_SENSE;
+		  srb->result = SUCCESS;
+		} else {
+		  info->sense_key = UNIT_ATTENTION;
+		  srb->result = CHECK_CONDITION;
+		}
+		return rc;
+	}
+
 	US_DEBUGP("datafab_transport:  Gah! Unknown command: %d (0x%x)\n", srb->cmnd[0], srb->cmnd[0]);
 	return USB_STOR_TRANSPORT_ERROR;
 }

diff -Naur linux-orig/drivers/usb/storage/jumpshot.c linux-2.4.17/drivers/usb/storage/jumpshot.c
@@ -10,6 +10,7 @@
  *   which I used as a template for this driver.
  *   Some bugfixes and scatter-gather code by Gregory P. Smith 
  *   ([email protected])
+ *   Fix for media change by Joerg Schneider ([email protected])
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

@@ -799,6 +800,23 @@
 		return USB_STOR_TRANSPORT_GOOD;
 	}
 
+	if (srb->cmnd[0] == START_STOP) {
+		// this is used by sd.c'check_scsidisk_media_change to detect
+		//  media change 
+		US_DEBUGP("jumpshot_transport:  START_STOP.\n");
+		rc = jumpshot_id_device(us, info);
+		if (rc == USB_STOR_TRANSPORT_GOOD) {
+		  info->sense_key = NO_SENSE;
+		  srb->result = SUCCESS;
+		} else {
+		  info->sense_key = UNIT_ATTENTION;
+		  srb->result = CHECK_CONDITION;
+		}
+		return rc;
+	}
+
+
+
 	US_DEBUGP("jumpshot_transport:  Gah! Unknown command: %d (0x%x)\n", srb->cmnd[0], srb->cmnd[0]);
 	return USB_STOR_TRANSPORT_ERROR;
 }

diff -Naur linux-orig/drivers/usb/storage/unusual_devs.h linux-2.4.17/drivers/usb/storage/unusual_devs.h
@@ -248,7 +248,7 @@
 		"Lexar",
 		"Jumpshot USB CF Reader",
 		US_SC_SCSI, US_PR_JUMPSHOT, NULL,
-		US_FL_MODE_XLATE | US_FL_START_STOP ),
+		US_FL_MODE_XLATE ),
 #endif
 
 UNUSUAL_DEV(  0x0644, 0x0000, 0x0100, 0x0100, 

@@ -332,7 +332,7 @@
 		"Datafab",
 		"MDCFE-B USB CF Reader",
 		US_SC_SCSI, US_PR_DATAFAB, NULL,
-		US_FL_MODE_XLATE | US_FL_START_STOP ),
+		US_FL_MODE_XLATE ),
 
 	/*
 	 * The following Datafab-based devices may or may not work

@@ -349,31 +349,38 @@
 		"SIIG/Datafab",
 		"SIIG/Datafab Memory Stick+CF Reader/Writer",
 		US_SC_SCSI, US_PR_DATAFAB, NULL,
-		US_FL_MODE_XLATE | US_FL_START_STOP ),
+		US_FL_MODE_XLATE ),
 
 UNUSUAL_DEV( 0x07c4, 0xa003, 0x0000, 0xffff,
 		"Datafab/Unknown",
 		"Datafab-based Reader",
 		US_SC_SCSI, US_PR_DATAFAB, NULL,
-		US_FL_MODE_XLATE | US_FL_START_STOP ),
+		US_FL_MODE_XLATE ),
 
 UNUSUAL_DEV( 0x07c4, 0xa004, 0x0000, 0xffff,
 		"Datafab/Unknown",
 		"Datafab-based Reader",
 		US_SC_SCSI, US_PR_DATAFAB, NULL,
-		US_FL_MODE_XLATE | US_FL_START_STOP ),
+		US_FL_MODE_XLATE ),
 
 UNUSUAL_DEV( 0x07c4, 0xa005, 0x0000, 0xffff,
 		"PNY/Datafab",
 		"PNY/Datafab CF+SM Reader",
 		US_SC_SCSI, US_PR_DATAFAB, NULL,
-		US_FL_MODE_XLATE | US_FL_START_STOP ),
+		US_FL_MODE_XLATE ),
 
 UNUSUAL_DEV( 0x07c4, 0xa006, 0x0000, 0xffff,
 		"Simple Tech/Datafab",
 		"Simple Tech/Datafab CF+SM Reader",
 		US_SC_SCSI, US_PR_DATAFAB, NULL,
-		US_FL_MODE_XLATE | US_FL_START_STOP ),
+		US_FL_MODE_XLATE ),
+
+UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff,
+		"Datafab/OnSpec Chipset: 0xa109",
+		"Datafab/OnSpec Chipset: 0xa109",
+		US_SC_SCSI, US_PR_DATAFAB, NULL,
+		US_FL_MODE_XLATE ),
+
 #endif
 
 /* Casio QV 2x00/3x00/8000 digital still cameras are not conformant