joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2025-02-25 16:01:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bluetooth: use corect struct member and number of protocols

Browse Source 
The original file is picked from 2.6.29b but struct definition of
uart_state has changed from then to 3.10. use correct definition.
Use correct definition of max number of protocols.

Change-Id: Id24efdd6e69640cb8f2374363e30e4dc44cc507a
CRs-Fixed: 706864
Signed-off-by: Anantha Krishnan <ananthk@codeaurora.org>
This commit is contained in:
Ananth Krishanan 2014-08-08 19:11:56 +05:30 committed by Anantha Krishnan
parent ad71719ab5
commit fc7d4ab765
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/bluetooth/hci_ibs.c
View File

@ -5,7 +5,7 @@
* protocol extension to H4.
*
* Copyright (C) 2007 Texas Instruments, Inc.
* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
* Copyright (c) 2010, 2012, 2014, The Linux Foundation. All rights reserved.
*
* Acknowledgements:
* This file is based on hci_ll.c, which was...
@ -50,7 +50,7 @@
#include <linux/serial_core.h>
#ifdef CONFIG_SERIAL_MSM_HS
#include <mach/msm_serial_hs.h>
#include <linux/platform_data/msm_serial_hs.h>
#endif
#include <net/bluetooth/bluetooth.h>
@ -141,7 +141,7 @@ struct ibs_struct {
static void __ibs_msm_serial_clock_on(struct tty_struct *tty)
{
struct uart_state *state = tty->driver_data;
struct uart_port *port = state->port;
struct uart_port *port = state->uart_port;
msm_hs_request_clock_on(port);
}
@ -149,7 +149,7 @@ static void __ibs_msm_serial_clock_on(struct tty_struct *tty)
static void __ibs_msm_serial_clock_request_off(struct tty_struct *tty)
{
struct uart_state *state = tty->driver_data;
struct uart_port *port = state->port;
struct uart_port *port = state->uart_port;
msm_hs_request_clock_off(port);
}

9
drivers/bluetooth/hci_uart.h
View File

@ -35,7 +35,7 @@
#define HCIUARTGETFLAGS _IOR('U', 204, int)
/* UART protocols */
#define HCI_UART_MAX_PROTO 6
#define HCI_UART_MAX_PROTO 7
#define HCI_UART_H4 0
#define HCI_UART_BCSP 1
@ -50,6 +50,8 @@
#define HCI_UART_CREATE_AMP 2
#define HCI_UART_INIT_PENDING 3
#include <linux/interrupt.h>
struct hci_uart;
struct hci_uart_proto {
@ -112,6 +114,11 @@ int ath_init(void);
int ath_deinit(void);
#endif
#ifdef CONFIG_BT_HCIUART_IBS
int ibs_init(void);
int ibs_deinit(void);
#endif
#ifdef CONFIG_BT_HCIUART_3WIRE
int h5_init(void);
int h5_deinit(void);