diff options
Diffstat (limited to 'drivers/bluetooth/dtl1_cs.c')
-rw-r--r-- | drivers/bluetooth/dtl1_cs.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index b881a9cd8741..4f02a6f3c980 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
@@ -573,11 +573,9 @@ static int dtl1_probe(struct pcmcia_device *link) | |||
573 | 573 | ||
574 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 574 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
575 | link->io.NumPorts1 = 8; | 575 | link->io.NumPorts1 = 8; |
576 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 576 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
577 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
578 | 577 | ||
579 | link->irq.Handler = dtl1_interrupt; | 578 | link->irq.Handler = dtl1_interrupt; |
580 | link->irq.Instance = info; | ||
581 | 579 | ||
582 | link->conf.Attributes = CONF_ENABLE_IRQ; | 580 | link->conf.Attributes = CONF_ENABLE_IRQ; |
583 | link->conf.IntType = INT_MEMORY_AND_IO; | 581 | link->conf.IntType = INT_MEMORY_AND_IO; |
@@ -622,16 +620,12 @@ static int dtl1_config(struct pcmcia_device *link) | |||
622 | goto failed; | 620 | goto failed; |
623 | 621 | ||
624 | i = pcmcia_request_irq(link, &link->irq); | 622 | i = pcmcia_request_irq(link, &link->irq); |
625 | if (i != 0) { | 623 | if (i != 0) |
626 | cs_error(link, RequestIRQ, i); | ||
627 | link->irq.AssignedIRQ = 0; | 624 | link->irq.AssignedIRQ = 0; |
628 | } | ||
629 | 625 | ||
630 | i = pcmcia_request_configuration(link, &link->conf); | 626 | i = pcmcia_request_configuration(link, &link->conf); |
631 | if (i != 0) { | 627 | if (i != 0) |
632 | cs_error(link, RequestConfiguration, i); | ||
633 | goto failed; | 628 | goto failed; |
634 | } | ||
635 | 629 | ||
636 | if (dtl1_open(info) != 0) | 630 | if (dtl1_open(info) != 0) |
637 | goto failed; | 631 | goto failed; |