Merge branch 'salted-string-hash'

[deliverable/linux.git] / drivers / bluetooth / btwilink.c

diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
index 24a652f9252be8995747e7b361691c6da5123e38..485281b3f1677678d650113877858eadb2352787 100644 (file)
--- a/drivers/bluetooth/btwilink.c
+++ b/drivers/bluetooth/btwilink.c
@@ -51,7 +51,7 @@
  */
 struct ti_st {
        struct hci_dev *hdev;
-       char reg_status;
+       int reg_status;
        long (*st_write) (struct sk_buff *);
        struct completion wait_reg_completion;
 };
@@ -83,7 +83,7 @@ static inline void ti_st_tx_complete(struct ti_st *hst, int pkt_type)
  * status.ti_st_open() function will wait for signal from this
  * API when st_register() function returns ST_PENDING.
  */
-static void st_reg_completion_cb(void *priv_data, char data)
+static void st_reg_completion_cb(void *priv_data, int data)
 {
        struct ti_st *lhst = priv_data;