diff options
Diffstat (limited to 'patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch')
| -rw-r--r-- | patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch index 1c14c79b..39cb54b8 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch @@ -24,7 +24,7 @@ do { info->hdev->stat.byte_rx++; -@@ -296,7 +304,11 @@ static irqreturn_t dtl1_interrupt(int ir +@@ -295,7 +303,11 @@ static irqreturn_t dtl1_interrupt(int ir /* our irq handler is shared */ return IRQ_NONE; @@ -36,7 +36,7 @@ spin_lock(&(info->lock)); -@@ -451,7 +463,11 @@ static int dtl1_hci_ioctl(struct hci_dev +@@ -444,7 +456,11 @@ static int dtl1_hci_send_frame(struct sk static int dtl1_open(dtl1_info_t *info) { unsigned long flags; @@ -48,7 +48,7 @@ struct hci_dev *hdev; spin_lock_init(&(info->lock)); -@@ -495,8 +511,13 @@ static int dtl1_open(dtl1_info_t *info) +@@ -487,8 +503,13 @@ static int dtl1_open(dtl1_info_t *info) outb(UART_LCR_WLEN8, iobase + UART_LCR); /* Reset DLAB */ outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), iobase + UART_MCR); @@ -62,7 +62,7 @@ /* Turn on interrupts */ outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER); -@@ -521,7 +542,11 @@ static int dtl1_open(dtl1_info_t *info) +@@ -513,7 +534,11 @@ static int dtl1_open(dtl1_info_t *info) static int dtl1_close(dtl1_info_t *info) { unsigned long flags; @@ -74,7 +74,7 @@ struct hci_dev *hdev = info->hdev; if (!hdev) -@@ -557,7 +582,24 @@ static int dtl1_probe(struct pcmcia_devi +@@ -549,7 +574,24 @@ static int dtl1_probe(struct pcmcia_devi info->p_dev = link; link->priv = info; @@ -99,7 +99,7 @@ return dtl1_config(link); } -@@ -571,6 +613,7 @@ static void dtl1_detach(struct pcmcia_de +@@ -563,6 +605,7 @@ static void dtl1_detach(struct pcmcia_de pcmcia_disable_device(link); } @@ -107,7 +107,7 @@ static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data) { if ((p_dev->resource[1]->end) || (p_dev->resource[1]->end < 8)) -@@ -581,6 +624,29 @@ static int dtl1_confcheck(struct pcmcia_ +@@ -573,6 +616,29 @@ static int dtl1_confcheck(struct pcmcia_ return pcmcia_request_io(p_dev); } @@ -137,7 +137,7 @@ static int dtl1_config(struct pcmcia_device *link) { -@@ -588,14 +654,24 @@ static int dtl1_config(struct pcmcia_dev +@@ -580,14 +646,24 @@ static int dtl1_config(struct pcmcia_dev int ret; /* Look for a generic full-sized window */ @@ -162,7 +162,7 @@ ret = pcmcia_enable_device(link); if (ret) -@@ -623,7 +699,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); +@@ -615,7 +691,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); static struct pcmcia_driver dtl1_driver = { .owner = THIS_MODULE, |