diff options
Diffstat (limited to 'drivers/bluetooth/bt3c_cs.c')
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 027cb8bf650f..1ad9694d4450 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -661,9 +661,6 @@ static int bt3c_probe(struct pcmcia_device *link) | |||
661 | 661 | ||
662 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 662 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
663 | link->io.NumPorts1 = 8; | 663 | link->io.NumPorts1 = 8; |
664 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | ||
665 | |||
666 | link->irq.Handler = bt3c_interrupt; | ||
667 | 664 | ||
668 | link->conf.Attributes = CONF_ENABLE_IRQ; | 665 | link->conf.Attributes = CONF_ENABLE_IRQ; |
669 | link->conf.IntType = INT_MEMORY_AND_IO; | 666 | link->conf.IntType = INT_MEMORY_AND_IO; |
@@ -743,9 +740,9 @@ static int bt3c_config(struct pcmcia_device *link) | |||
743 | goto failed; | 740 | goto failed; |
744 | 741 | ||
745 | found_port: | 742 | found_port: |
746 | i = pcmcia_request_irq(link, &link->irq); | 743 | i = pcmcia_request_irq(link, &bt3c_interrupt); |
747 | if (i != 0) | 744 | if (i != 0) |
748 | link->irq.AssignedIRQ = 0; | 745 | goto failed; |
749 | 746 | ||
750 | i = pcmcia_request_configuration(link, &link->conf); | 747 | i = pcmcia_request_configuration(link, &link->conf); |
751 | if (i != 0) | 748 | if (i != 0) |