summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch')
-rw-r--r--patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch
index dcaa69c3..83be629e 100644
--- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch
+++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch
@@ -49,7 +49,7 @@
if (test_bit(XMIT_SENDING_READY, &(info->tx_state)))
bluecard_enable_activity_led(info);
-@@ -507,7 +524,11 @@ static irqreturn_t bluecard_interrupt(in
+@@ -506,7 +523,11 @@ static irqreturn_t bluecard_interrupt(in
if (!test_bit(CARD_READY, &(info->hw_state)))
return IRQ_HANDLED;
@@ -61,7 +61,7 @@
spin_lock(&(info->lock));
-@@ -629,7 +650,11 @@ static int bluecard_hci_open(struct hci_
+@@ -628,7 +649,11 @@ static int bluecard_hci_open(struct hci_
return 0;
if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) {
@@ -73,7 +73,7 @@
/* Enable LED */
outb(0x08 | 0x20, iobase + 0x30);
-@@ -649,7 +674,11 @@ static int bluecard_hci_close(struct hci
+@@ -648,7 +673,11 @@ static int bluecard_hci_close(struct hci
bluecard_hci_flush(hdev);
if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) {
@@ -85,7 +85,7 @@
/* Disable LED */
outb(0x00, iobase + 0x30);
-@@ -705,7 +734,11 @@ static int bluecard_hci_ioctl(struct hci
+@@ -698,7 +727,11 @@ static int bluecard_hci_send_frame(struc
static int bluecard_open(bluecard_info_t *info)
{
@@ -97,7 +97,7 @@
struct hci_dev *hdev;
unsigned char id;
-@@ -821,7 +854,11 @@ static int bluecard_open(bluecard_info_t
+@@ -813,7 +846,11 @@ static int bluecard_open(bluecard_info_t
static int bluecard_close(bluecard_info_t *info)
{
@@ -109,7 +109,7 @@
struct hci_dev *hdev = info->hdev;
if (!hdev)
-@@ -856,7 +893,18 @@ static int bluecard_probe(struct pcmcia_
+@@ -848,7 +885,18 @@ static int bluecard_probe(struct pcmcia_
info->p_dev = link;
link->priv = info;
@@ -128,7 +128,7 @@
return bluecard_config(link);
}
-@@ -873,15 +921,30 @@ static int bluecard_config(struct pcmcia
+@@ -865,15 +913,30 @@ static int bluecard_config(struct pcmcia
bluecard_info_t *info = link->priv;
int i, n;
@@ -159,7 +159,7 @@
if (i == 0)
break;
}
-@@ -889,9 +952,15 @@ static int bluecard_config(struct pcmcia
+@@ -881,9 +944,15 @@ static int bluecard_config(struct pcmcia
if (i != 0)
goto failed;
@@ -175,7 +175,7 @@
i = pcmcia_enable_device(link);
if (i != 0)
-@@ -929,7 +998,13 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids
+@@ -921,7 +990,13 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids
static struct pcmcia_driver bluecard_driver = {
.owner = THIS_MODULE,