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

[Anders J. <and...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.c     1.218           1.219=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Handle btmem init failure.


The diff of the modified file(s):

--- bluetooth.c	2002/01/15 11:01:56	1.218
+++ bluetooth.c	2002/01/24 12:43:36	1.219
@@ -1195,8 +1195,8 @@
 #ifdef CONFIG_BLUETOOTH_UNPLUG_TEST
 	case BNEPTEST:
 	{
-		s8 temp[5];
-		copy_from_user(&temp, (s32*)arg, 5);
+		s8 temp[2];
+		copy_from_user(&temp, (s32*)arg, 2);
 		printk("BNEP TEST %i\n", temp[0]);=20=20=20
 		return bnep_test(&temp[0]);
 	}
@@ -2627,7 +2627,15 @@
 	add_timer(&bt_clear_led_timer);
 #endif
=20
-	btmem_init();
+	if(btmem_init() =3D=3D -1) {
+	  D_ERR("BTMEM init failed");
+#ifdef __CRIS__
+	  del_timer(&bt_clear_led_timer);
+	  bt_set_leds(NO_BLUETOOTH_ACTIVITY);
+#endif
+	  return -1;
+	}
+=09
=20
 #ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
 	if (bt_use_bcsp(-1) && !bcsp_issyncronized()) {=20=20