summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch')
-rw-r--r--patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch
index be1a160e..50941bf4 100644
--- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch
+++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch
@@ -12,7 +12,7 @@
register struct sk_buff *skb;
int len;
-@@ -181,7 +185,11 @@ static void btuart_receive(btuart_info_t
+@@ -182,7 +186,11 @@ static void btuart_receive(btuart_info_t
return;
}
@@ -24,7 +24,7 @@
do {
info->hdev->stat.byte_rx++;
-@@ -294,7 +302,11 @@ static irqreturn_t btuart_interrupt(int
+@@ -296,7 +304,11 @@ static irqreturn_t btuart_interrupt(int
/* our irq handler is shared */
return IRQ_NONE;
@@ -36,7 +36,7 @@
spin_lock(&(info->lock));
-@@ -351,7 +363,11 @@ static void btuart_change_speed(btuart_i
+@@ -353,7 +365,11 @@ static void btuart_change_speed(btuart_i
return;
}
@@ -48,7 +48,7 @@
spin_lock_irqsave(&(info->lock), flags);
-@@ -456,7 +472,11 @@ static int btuart_hci_send_frame(struct
+@@ -458,7 +474,11 @@ static int btuart_hci_send_frame(struct
static int btuart_open(btuart_info_t *info)
{
unsigned long flags;
@@ -60,7 +60,7 @@
struct hci_dev *hdev;
spin_lock_init(&(info->lock));
-@@ -522,7 +542,11 @@ static int btuart_open(btuart_info_t *in
+@@ -524,7 +544,11 @@ static int btuart_open(btuart_info_t *in
static int btuart_close(btuart_info_t *info)
{
unsigned long flags;
@@ -72,7 +72,7 @@
struct hci_dev *hdev = info->hdev;
if (!hdev)
-@@ -558,8 +582,27 @@ static int btuart_probe(struct pcmcia_de
+@@ -560,8 +584,27 @@ static int btuart_probe(struct pcmcia_de
info->p_dev = link;
link->priv = info;
@@ -100,7 +100,7 @@
return btuart_config(link);
}
-@@ -570,6 +613,7 @@ static void btuart_detach(struct pcmcia_
+@@ -572,6 +615,7 @@ static void btuart_detach(struct pcmcia_
btuart_release(link);
}
@@ -108,7 +108,7 @@
static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data)
{
int *try = priv_data;
-@@ -608,6 +652,63 @@ static int btuart_check_config_notpicky(
+@@ -610,6 +654,63 @@ static int btuart_check_config_notpicky(
}
return -ENODEV;
}
@@ -172,7 +172,7 @@
static int btuart_config(struct pcmcia_device *link)
{
-@@ -631,9 +732,15 @@ static int btuart_config(struct pcmcia_d
+@@ -633,9 +734,15 @@ static int btuart_config(struct pcmcia_d
goto failed;
found_port:
@@ -188,7 +188,7 @@
i = pcmcia_enable_device(link);
if (i != 0)
-@@ -667,7 +774,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids);
+@@ -669,7 +776,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids);
static struct pcmcia_driver btuart_driver = {
.owner = THIS_MODULE,