openwrtv3/target/linux/omap24xx/patches-2.6.38/410-hci-h4p-fixes.patch

53 lines
1.7 KiB
Diff
Raw Normal View History

Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/core.c
===================================================================
--- linux-2.6.38-rc7.orig/drivers/bluetooth/hci_h4p/core.c 2011-03-07 15:32:55.783737501 +0100
+++ linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/core.c 2011-03-07 15:33:09.851047680 +0100
@@ -36,9 +36,9 @@
#include <linux/clk.h>
#include <linux/gpio.h>
-#include <mach/hardware.h>
-#include <mach/board.h>
-#include <mach/irqs.h>
+#include <plat/hardware.h>
+#include <plat/board.h>
+#include <plat/irqs.h>
#include <plat/serial.h>
#include <net/bluetooth/bluetooth.h>
Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/hci_h4p.h
===================================================================
--- linux-2.6.38-rc7.orig/drivers/bluetooth/hci_h4p/hci_h4p.h 2011-03-07 15:32:55.766739543 +0100
+++ linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/hci_h4p.h 2011-03-07 15:33:09.852047560 +0100
@@ -21,7 +21,7 @@
*
*/
-#include <mach/board.h>
+#include <plat/board.h>
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
Index: linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/sysfs.c
===================================================================
--- linux-2.6.38-rc7.orig/drivers/bluetooth/hci_h4p/sysfs.c 2011-03-07 15:32:55.807734619 +0100
+++ linux-2.6.38-rc7/drivers/bluetooth/hci_h4p/sysfs.c 2011-03-07 15:33:09.852047560 +0100
@@ -48,15 +48,8 @@ static ssize_t hci_h4p_store_bdaddr(stru
return -EINVAL;
}
- //for (i = 0; i < 6; i++)
- //info->bdaddr[i] = bdaddr[i] & 0xff;
-
- info->bdaddr[0] = 0x00;
- info->bdaddr[1] = 0x1D;
- info->bdaddr[2] = 0x6E;
- info->bdaddr[3] = 0xD4;
- info->bdaddr[4] = 0xF0;
- info->bdaddr[5] = 0x37;
+ for (i = 0; i < 6; i++)
+ info->bdaddr[i] = bdaddr[i] & 0xff;
return count;
}