diff options
| author | Luis R. Rodriguez | 2009-09-03 02:06:21 +0200 |
|---|---|---|
| committer | John W. Linville | 2009-09-08 22:31:04 +0200 |
| commit | fc548af877374f7e26c4f670f3843c6d29e02a98 (patch) | |
| tree | 8c32540ab846508cb187572845ab33438c43638f /drivers | |
| parent | ath9k: propagate errors on ath_init_device() and request_irq() (diff) | |
| download | kernel-qcow2-linux-fc548af877374f7e26c4f670f3843c6d29e02a98.tar.gz kernel-qcow2-linux-fc548af877374f7e26c4f670f3843c6d29e02a98.tar.xz kernel-qcow2-linux-fc548af877374f7e26c4f670f3843c6d29e02a98.zip | |
ath9k: claim irq for ath9k, not ath for pci
ath9k ahb requests an IRQ and indicates 'ath9k' claimed it,
ath9k pci requests an IRQ and indicates 'ath' claims it;
since 'ath' is another module sync both ahb and pci to claim
the irq using 'ath9k'.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index bc4bc2c2d378..8bb286df71b1 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c @@ -187,7 +187,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) /* setup interrupt service routine */ - ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath", sc); + ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc); if (ret) { dev_err(&pdev->dev, "request_irq failed\n"); goto bad4; |