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.patch18
1 files changed, 9 insertions, 9 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 d35eaad2..05796884 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
@@ -24,7 +24,7 @@
do {
info->hdev->stat.byte_rx++;
-@@ -295,7 +303,11 @@ static irqreturn_t btuart_interrupt(int
+@@ -294,7 +302,11 @@ static irqreturn_t btuart_interrupt(int
/* our irq handler is shared */
return IRQ_NONE;
@@ -36,7 +36,7 @@
spin_lock(&(info->lock));
-@@ -352,7 +364,11 @@ static void btuart_change_speed(btuart_i
+@@ -351,7 +363,11 @@ static void btuart_change_speed(btuart_i
return;
}
@@ -48,7 +48,7 @@
spin_lock_irqsave(&(info->lock), flags);
-@@ -471,7 +487,11 @@ static int btuart_hci_ioctl(struct hci_d
+@@ -464,7 +480,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));
-@@ -538,7 +558,11 @@ static int btuart_open(btuart_info_t *in
+@@ -530,7 +550,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)
-@@ -574,8 +598,27 @@ static int btuart_probe(struct pcmcia_de
+@@ -566,8 +590,27 @@ static int btuart_probe(struct pcmcia_de
info->p_dev = link;
link->priv = info;
@@ -100,7 +100,7 @@
return btuart_config(link);
}
-@@ -586,6 +629,7 @@ static void btuart_detach(struct pcmcia_
+@@ -578,6 +621,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;
-@@ -624,6 +668,63 @@ static int btuart_check_config_notpicky(
+@@ -616,6 +660,63 @@ static int btuart_check_config_notpicky(
}
return -ENODEV;
}
@@ -172,7 +172,7 @@
static int btuart_config(struct pcmcia_device *link)
{
-@@ -647,9 +748,15 @@ static int btuart_config(struct pcmcia_d
+@@ -639,9 +740,15 @@ static int btuart_config(struct pcmcia_d
goto failed;
found_port:
@@ -188,7 +188,7 @@
i = pcmcia_enable_device(link);
if (i != 0)
-@@ -683,7 +790,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids);
+@@ -675,7 +782,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids);
static struct pcmcia_driver btuart_driver = {
.owner = THIS_MODULE,