Commit c1d8b7db authored by Romain Liévin's avatar Romain Liévin Committed by Greg Kroah-Hartman

[PATCH] USB: tiglusb update

- a patch against 2.5.50 (clean-up and includes Randy Dunlap's patch).
parent 5a2480df
...@@ -15,16 +15,11 @@ ...@@ -15,16 +15,11 @@
* for more info. * for more info.
* *
* History : * History :
* 16/07/2002 : v1.04 -- Julien BLACHE <jb@jblache.org> * 1.0x, Romain & Julien: initial submit.
* + removed useless usblp_cleanup() * 1.03, Greg Kroah: modifications.
* + removed {un,}lock_kernel() as suggested on lkml * 1.04, Julien: clean-up & fixes; Romain: 2.4 backport.
* + inlined clear_pipes() (used once) * 1.05, Randy Dunlap: bug fix with the timeout parameter (divide-by-zero).
* + inlined clear_device() (small, used twice) * 1.06, Romain: synched with 2.5, version/firmware changed (confusing).
* + removed tiglusb_find_struct() (used once, simple code)
* + replaced down() with down_interruptible() wherever possible
* + fixed double unregistering wrt devfs, causing devfs
* to force an oops when the device is deconnected
* + removed unused fields from struct tiglusb_t
*/ */
#include <linux/module.h> #include <linux/module.h>
...@@ -44,7 +39,7 @@ ...@@ -44,7 +39,7 @@
/* /*
* Version Information * Version Information
*/ */
#define DRIVER_VERSION "1.04" #define DRIVER_VERSION "1.06"
#define DRIVER_AUTHOR "Romain Lievin <roms@lpg.ticalc.org> & Julien Blache <jb@jblache.org>" #define DRIVER_AUTHOR "Romain Lievin <roms@lpg.ticalc.org> & Julien Blache <jb@jblache.org>"
#define DRIVER_DESC "TI-GRAPH LINK USB (aka SilverLink) driver" #define DRIVER_DESC "TI-GRAPH LINK USB (aka SilverLink) driver"
#define DRIVER_LICENSE "GPL" #define DRIVER_LICENSE "GPL"
...@@ -387,7 +382,7 @@ tiglusb_probe (struct usb_interface *intf, ...@@ -387,7 +382,7 @@ tiglusb_probe (struct usb_interface *intf,
&tiglusb_fops, NULL); &tiglusb_fops, NULL);
/* Display firmware version */ /* Display firmware version */
info ("link cable version %i.%02x", info ("firmware revision %i.%02x",
dev->descriptor.bcdDevice >> 8, dev->descriptor.bcdDevice >> 8,
dev->descriptor.bcdDevice & 0xff); dev->descriptor.bcdDevice & 0xff);
...@@ -453,7 +448,7 @@ tiglusb_setup (char *str) ...@@ -453,7 +448,7 @@ tiglusb_setup (char *str)
if (ints[0] > 0) { if (ints[0] > 0) {
timeout = ints[1]; timeout = ints[1];
} }
if (!timeout) if (timeout <= 0)
timeout = TIMAXTIME; timeout = TIMAXTIME;
return 1; return 1;
...@@ -494,9 +489,9 @@ tiglusb_init (void) ...@@ -494,9 +489,9 @@ tiglusb_init (void)
return -1; return -1;
} }
info (DRIVER_DESC ", " DRIVER_VERSION); info (DRIVER_DESC ", version " DRIVER_VERSION);
if (!timeout) if (timeout <= 0)
timeout = TIMAXTIME; timeout = TIMAXTIME;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment