patch-2.4.7 linux/drivers/usb/bluetooth.c

• Lines: 51
• Date: Thu Jul 12 14:21:05 2001
• Orig file: v2.4.6/linux/drivers/usb/bluetooth.c
• Orig date: Tue Jul 3 17:08:21 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/usb/bluetooth.c linux/drivers/usb/bluetooth.c
@@ -1,11 +1,15 @@
 /*
- * bluetooth.c   Version 0.11
+ * bluetooth.c   Version 0.12
  *
  * Copyright (c) 2000, 2001 Greg Kroah-Hartman	<greg@kroah.com>
  * Copyright (c) 2000 Mark Douglas Corner	<mcorner@umich.edu>
  *
  * USB Bluetooth driver, based on the Bluetooth Spec version 1.0B
  * 
+ * (2001/07/09) Version 0.12 gkh
+ *	- removed in_interrupt() call, as it doesn't make sense to do 
+ *	  that anymore.
+ *
  * (2001/06/05) Version 0.11 gkh
  *	- Fixed problem with read urb status saying that we have shutdown,
  *	  and that we shouldn't resubmit the urb.  Patch from unknown.
@@ -114,9 +118,9 @@
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v0.11"
+#define DRIVER_VERSION "v0.12"
 #define DRIVER_AUTHOR "Greg Kroah-Hartman, Mark Douglas Corner"
-#define DRIVER_DESC "USB Bluetooth driver"
+#define DRIVER_DESC "USB Bluetooth tty driver"
 
 /* define this if you have hardware that is not good */
 /*#define	BTBUGGYHARDWARE */
@@ -484,12 +488,6 @@
 		case CMD_PKT:
 			/* dbg(__FUNCTION__ "- Send cmd_pkt len:%d", count);*/
 
-			if (in_interrupt()){
-				printk("cmd_pkt from interrupt!\n");
-				retval = count;
-				goto exit;
-			}
-
 			retval = bluetooth_ctrl_msg (bluetooth, 0x00, 0x00, &current_buffer[1], count-1);
 			if (retval) {
 				goto exit;
@@ -1329,7 +1327,7 @@
 		return -1;
 	}
 
-	info(DRIVER_VERSION ":" DRIVER_DESC);
+	info(DRIVER_DESC " " DRIVER_VERSION);
 
 	return 0;
 }