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.196           1.197=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made the BT_SET_DFU_MODE ioctl available even if BCSP is not supported.


The diff of the modified file(s):

--- bluetooth.c	2001/09/12 13:55:36	1.196
+++ bluetooth.c	2001/09/13 15:53:38	1.197
@@ -1096,6 +1096,15 @@
 		put_user(tmp, (s32*)arg);
 		return 0;
=20
+	case BT_SET_DFU_MODE:
+		GET_USER(tmp, (s32*)arg);
+
+		BT_DRIVER("BT_SET_DFU_MODE: %d\n", tmp);
+
+		tmp =3D bt_dfu_mode(tmp);
+		put_user(tmp, (s32*)arg);
+		return 0;
+
 #ifdef CONFIG_BLUETOOTH_CSR
 	/* | ps_key (u16) | rw_mode (u16) | len (u16) | params (u16[])| */
 	case BT_CSR_PSKEY:
@@ -1119,15 +1128,6 @@
 			printk("Sync failed\n");
 			return -ETIMEDOUT;
 		}
-		return 0;
-
-	case BT_SET_DFU_MODE:
-		GET_USER(tmp, (s32*)arg);
-
-		BT_DRIVER("BT_SET_DFU_MODE: %d\n", tmp);
-
-		tmp =3D bt_dfu_mode(tmp);
-		put_user(tmp, (s32*)arg);
 		return 0;
=20
 	case BT_SEND_DFU_COMMAND: