CVS: The file 'linux/drivers/char/bluetooth/bluetooth.c' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.c     1.195           1.196=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Make sure the LED timer is started before doing any communication
with the Bluetooth module.


The diff of the modified file(s):

--- bluetooth.c	2001/09/12 12:38:10	1.195
+++ bluetooth.c	2001/09/12 13:55:36	1.196
@@ -2566,6 +2566,15 @@
=20
 	DSYS("Current HW: %s\n", bt_hw_vendor());
=20
+#ifdef __CRIS__
+	/* start led timer */
+	bt_set_leds(NO_BLUETOOTH_ACTIVITY);
+	init_timer(&bt_clear_led_timer);
+	bt_clear_led_timer.function =3D &bt_clear_led;
+	bt_clear_led_timer.expires =3D jiffies + HZ/10;
+	add_timer(&bt_clear_led_timer);
+#endif
+
 	btmem_init();
=20
 #ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
@@ -2603,14 +2612,6 @@
 	bt_reset_linebuf();
 #endif
=20
-#ifdef __CRIS__
-	/* start led timer */
-	bt_set_leds(NO_BLUETOOTH_ACTIVITY);
-	init_timer(&bt_clear_led_timer);
-	bt_clear_led_timer.function =3D &bt_clear_led;
-	bt_clear_led_timer.expires =3D jiffies + HZ/10;
-	add_timer(&bt_clear_led_timer);
-#endif
 	return 0;
=20
 init_failed_exit1:=20
@@ -2621,6 +2622,10 @@
 	  free_page((unsigned long) tmp_bt_buf);
 	  tmp_bt_buf =3D NULL;
 	}
+#ifdef __CRIS__
+	del_timer(&bt_clear_led_timer);
+	bt_set_leds(NO_BLUETOOTH_ACTIVITY);
+#endif
 	return -1;
 }
=20
@@ -3001,9 +3006,7 @@
 	btmem_shutdown();
=20
 #ifdef __CRIS__
-	if (bt_stack_initiated) {
 		del_timer(&bt_clear_led_timer);
-	}
 	bt_set_leds(NO_BLUETOOTH_ACTIVITY);
 #endif
=20