diff options
| author | Chas Williams <chas@cmf.nrl.navy.mil> | 2008-01-07 00:26:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-08 23:30:01 -0800 |
| commit | 52961955aa180959158faeb9fd6b4f8a591450f5 (patch) | |
| tree | 6139c989d4a5f348e2b69185ea797f0a8d67bff5 /drivers/atm | |
| parent | c6a1b62de9d043f274ec3ae2e207908c6d5feff3 (diff) | |
| download | kernel_samsung_smdk4412-52961955aa180959158faeb9fd6b4f8a591450f5.zip kernel_samsung_smdk4412-52961955aa180959158faeb9fd6b4f8a591450f5.tar.gz kernel_samsung_smdk4412-52961955aa180959158faeb9fd6b4f8a591450f5.tar.bz2 | |
[ATM]: [nicstar] delay irq setup until card is configured
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/nicstar.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index 14ced85..0c205b0 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -625,14 +625,6 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) if (mac[i] == NULL) nicstar_init_eprom(card->membase); - if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0) - { - printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq); - error = 9; - ns_init_card_error(card, error); - return error; - } - /* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */ writel(0x00000000, card->membase + VPM); @@ -858,8 +850,6 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) card->iovpool.count++; } - card->intcnt = 0; - /* Configure NICStAR */ if (card->rct_size == 4096) ns_cfg_rctsize = NS_CFG_RCTSIZE_4096_ENTRIES; @@ -868,6 +858,15 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) card->efbie = 1; + card->intcnt = 0; + if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0) + { + printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq); + error = 9; + ns_init_card_error(card, error); + return error; + } + /* Register device */ card->atmdev = atm_dev_register("nicstar", &atm_ops, -1, NULL); if (card->atmdev == NULL) |