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.207           1.208=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Make sure bcsp_shutdown() is called if bcsp_init() fails.


The diff of the modified file(s):

--- bluetooth.c	2001/10/16 16:12:14	1.207
+++ bluetooth.c	2001/10/22 12:49:20	1.208
@@ -1131,6 +1131,7 @@
 		BT_DRIVER("BTINITBCSP\n");
 		if (bcsp_init() < 0) {
 			printk("Sync failed\n");
+			bcsp_shutdown();
 			return -ETIMEDOUT;
 		}
 		return 0;
@@ -2564,7 +2565,6 @@
 #ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
 	if (bt_use_bcsp(-1) && !bcsp_issyncronized()) {=20=20
 		if (bcsp_init() < 0) {
-			bcsp_shutdown();
 			goto init_failed_exit0;
 		}
  	}
@@ -2600,10 +2600,10 @@
=20
 init_failed_exit1:=20
 	hci_shutdown();
+init_failed_exit0:
 #ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
 	bcsp_shutdown();
 #endif
-init_failed_exit0:
 	btmem_shutdown();
 	if (tmp_bt_buf) {
 		free_page((unsigned long) tmp_bt_buf);