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

   1 Index: linux-3.1/drivers/bluetooth/hci_h4p/core.c
   2 ===================================================================
   3 --- linux-3.1.orig/drivers/bluetooth/hci_h4p/core.c     2011-10-30 00:48:52.285041210 +0200
   4 +++ linux-3.1/drivers/bluetooth/hci_h4p/core.c  2011-10-30 00:48:53.101040400 +0200
   5 @@ -36,9 +36,9 @@
   6  #include <linux/clk.h>
   7  #include <linux/gpio.h>
   8
   9 -#include <mach/hardware.h>
  10 -#include <mach/board.h>
  11 -#include <mach/irqs.h>
  12 +#include <plat/hardware.h>
  13 +#include <plat/board.h>
  14 +#include <plat/irqs.h>
  15  #include <plat/serial.h>
  16
  17  #include <net/bluetooth/bluetooth.h>
  18 Index: linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h
  19 ===================================================================
  20 --- linux-3.1.orig/drivers/bluetooth/hci_h4p/hci_h4p.h  2011-10-30 00:48:52.285041210 +0200
  21 +++ linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h       2011-10-30 00:48:53.101040400 +0200
  22 @@ -21,7 +21,7 @@
  23   *
  24   */
  25
  26 -#include <mach/board.h>
  27 +#include <plat/board.h>
  28
  29  #include <net/bluetooth/bluetooth.h>
  30  #include <net/bluetooth/hci_core.h>
  31 Index: linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c
  32 ===================================================================
  33 --- linux-3.1.orig/drivers/bluetooth/hci_h4p/sysfs.c    2011-10-30 00:48:52.285041210 +0200
  34 +++ linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c 2011-10-30 00:48:53.101040400 +0200
  35 @@ -48,15 +48,8 @@ static ssize_t hci_h4p_store_bdaddr(stru
  36                 return -EINVAL;
  37         }
  38
  39 -       //for (i = 0; i < 6; i++)
  40 -               //info->bdaddr[i] = bdaddr[i] & 0xff;
  41 -
  42 -       info->bdaddr[0] = 0x00;
  43 -       info->bdaddr[1] = 0x1D;
  44 -       info->bdaddr[2] = 0x6E;
  45 -       info->bdaddr[3] = 0xD4;
  46 -       info->bdaddr[4] = 0xF0;
  47 -       info->bdaddr[5] = 0x37;
  48 +       for (i = 0; i < 6; i++)
  49 +               info->bdaddr[i] = bdaddr[i] & 0xff;
  50
  51         return count;
  52  }