[linux-usb-devel] [PATCH] USB bluetooth driver update for 2.2.20-pre2

[Greg KH]

(patch 3 of 8)

Hi,

Here's a patch for the usb bluetooth driver against 2.2.20-pre2 that
brings it up to the same logic level that is in 2.4.5.

thanks,

greg k-h

diff -Nru a/drivers/usb/bluetooth.c b/drivers/usb/bluetooth.c
--- a/drivers/usb/bluetooth.c   Tue Jun 12 22:34:40 2001
+++ b/drivers/usb/bluetooth.c   Tue Jun 12 22:34:40 2001
@@ -1,10 +1,19 @@
 /*
- * bluetooth.c   Version 0.7
+ * bluetooth.c   Version 0.8
  *
  * Copyright (c) 2000 Greg Kroah-Hartman       <[EMAIL PROTECTED]>
  * Copyright (c) 2000 Mark Douglas Corner      <[EMAIL PROTECTED]>
  *
  * USB Bluetooth driver, based on the Bluetooth Spec version 1.0B
+ * 
+ * (08/04/2001) gb
+ *     Identify version on module load.
+ *
+ * (2001/03/10) Version 0.8 gkh
+ *     Fixed problem with not unlinking interrupt urb on device close
+ *     and resubmitting the read urb on error with bluetooth struct.
+ *     Thanks to Narayan Mohanram <[EMAIL PROTECTED]> for the
+ *     fixes.
  *
  * (11/29/2000) Version 0.7 gkh
  *     Fixed problem with overrunning the tty flip buffer.
@@ -86,9 +95,12 @@
 #define DEBUG
 #include <linux/usb.h>
 
-/* Module information */
-MODULE_AUTHOR("Greg Kroah-Hartman, Mark Douglas Corner");
-MODULE_DESCRIPTION("USB Bluetooth driver");
+/*
+ * Version Information
+ */
+#define DRIVER_VERSION "v0.8"
+#define DRIVER_AUTHOR "Greg Kroah-Hartman, Mark Douglas Corner"
+#define DRIVER_DESC "USB Bluetooth driver"
 
 /* define this if you have hardware that is not good */
 /*#define      BTBUGGYHARDWARE */
@@ -371,6 +383,7 @@
        for (i = 0; i < NUM_BULK_URBS; ++i)
                usb_unlink_urb (bluetooth->write_urb_pool[i]);
        usb_unlink_urb (bluetooth->read_urb);
+       usb_unlink_urb (bluetooth->interrupt_in_urb);
 
        bluetooth->active = 0;
 }
@@ -844,7 +857,7 @@
 
        if (!bluetooth) {
                dbg(__FUNCTION__ " - bad bluetooth pointer, exiting");
-               goto exit;
+               return;
        }
 
        if (urb->status) {
@@ -1274,6 +1287,9 @@
                return -1;
        }
 
+       info(DRIVER_VERSION " " DRIVER_AUTHOR);
+       info(DRIVER_DESC);
+
        return 0;
 }
 
@@ -1288,4 +1304,7 @@
 module_init(usb_bluetooth_init);
 module_exit(usb_bluetooth_exit);
 
+/* Module information */
+MODULE_AUTHOR( DRIVER_AUTHOR );
+MODULE_DESCRIPTION( DRIVER_DESC );