patch-2.4.0-test3 linux/drivers/usb/microtek.c

Next file: linux/drivers/usb/microtek.h
Previous file: linux/drivers/usb/input.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/usb/microtek.c linux/drivers/usb/microtek.c
@@ -52,11 +52,10 @@
  * you want it, just send mail.
  *
  * Status:
- *
- *	This driver does not work properly yet.
+ *	
  *	Untested with multiple scanners.
  *	Untested on SMP.
- *	Untested on UHCI.
+ *	Untested on a bigendian machine.
  *
  * History:
  *
@@ -97,6 +96,8 @@
  *	20000602 Version 0.2.0
  *	20000603 various cosmetic changes
  *	20000603 Version 0.2.1
+ *	20000620 minor cosmetic changes
+ *	20000620 Version 0.2.2
  */
 
 #include <linux/module.h>
@@ -146,7 +147,7 @@
 
 /* Internal driver stuff */
 
-#define MTS_VERSION	"0.2.1"
+#define MTS_VERSION	"0.2.2"
 #define MTS_NAME	"microtek usb (rev " MTS_VERSION "): "
 
 #define MTS_WARNING(x...) \
@@ -409,7 +410,7 @@
 	MTS_DEBUG_GOT_HERE();
 	mts_debug_dump(desc);
 
-	usb_reset_device(desc->usb_dev);
+	usb_reset_device(desc->usb_dev); /*FIXME: untested on new reset code */
 	return 0;  /* RANT why here 0 and not SUCCESS */
 }
 
@@ -519,7 +520,7 @@
 
 	MTS_INT_INIT();
 
-	context->srb->result &= MTS_MAX_CHUNK_MASK;
+	context->srb->result &= MTS_SCSI_ERR_MASK;
 	context->srb->result |= (unsigned)context->status<<1;
 
 	mts_transfer_cleanup(transfer);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)