ChangeSet 1.1807.48.43, 2004/08/05 15:00:47-07:00, [EMAIL PROTECTED]
[PATCH] USB: LEGO USB Tower, move reset from probe to open
the following patch reduces the amount of garbage data sent by
the device after open (must be the heat here causing trouble).
Move the vendor-specific device reset from probe to open to
reduce spurious data.
Signed-off-by: Juergen Stuber <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
drivers/usb/misc/legousbtower.c | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff -Nru a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
--- a/drivers/usb/misc/legousbtower.c 2004-08-23 13:18:14 -07:00
+++ b/drivers/usb/misc/legousbtower.c 2004-08-23 13:18:14 -07:00
@@ -71,6 +71,8 @@
* - make device locking interruptible
* 2004-04-30 - 0.95 Juergen Stuber <[EMAIL PROTECTED]>
* - check for valid udev on resubmitting and unlinking urbs
+ * 2004-08-03 - 0.96 Juergen Stuber <[EMAIL PROTECTED]>
+ * - move reset into open to clean out spurious data
*/
#include <linux/config.h>
@@ -98,7 +100,7 @@
/* Version Information */
-#define DRIVER_VERSION "v0.95"
+#define DRIVER_VERSION "v0.96"
#define DRIVER_AUTHOR "Juergen Stuber <[EMAIL PROTECTED]>"
#define DRIVER_DESC "LEGO USB Tower Driver"
@@ -341,6 +343,8 @@
int subminor;
int retval = 0;
struct usb_interface *interface;
+ struct tower_reset_reply reset_reply;
+ int result;
dbg(2, "%s: enter", __FUNCTION__);
@@ -377,6 +381,22 @@
}
dev->open_count = 1;
+ /* reset the tower */
+ result = usb_control_msg (dev->udev,
+ usb_rcvctrlpipe(dev->udev, 0),
+ LEGO_USB_TOWER_REQUEST_RESET,
+ USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_DEVICE,
+ 0,
+ 0,
+ &reset_reply,
+ sizeof(reset_reply),
+ HZ);
+ if (result < 0) {
+ err("LEGO USB Tower reset control request failed");
+ retval = result;
+ goto unlock_exit;
+ }
+
/* initialize in direction */
dev->read_buffer_length = 0;
dev->read_packet_length = 0;
@@ -827,7 +847,6 @@
struct lego_usb_tower *dev = NULL;
struct usb_host_interface *iface_desc;
struct usb_endpoint_descriptor* endpoint;
- struct tower_reset_reply reset_reply;
struct tower_get_version_reply get_version_reply;
int i;
int retval = -ENOMEM;
@@ -949,22 +968,6 @@
/* let the user know what node this device is now attached to */
info ("LEGO USB Tower #%d now attached to major %d minor %d", (dev->minor -
LEGO_USB_TOWER_MINOR_BASE), USB_MAJOR, dev->minor);
-
- /* reset the tower */
- result = usb_control_msg (udev,
- usb_rcvctrlpipe(udev, 0),
- LEGO_USB_TOWER_REQUEST_RESET,
- USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_DEVICE,
- 0,
- 0,
- &reset_reply,
- sizeof(reset_reply),
- HZ);
- if (result < 0) {
- err("LEGO USB Tower reset control request failed");
- retval = result;
- goto error;
- }
/* get the firmware version and log it */
result = usb_control_msg (udev,
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
