From patchwork Thu Sep 3 00:06:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Rodriguez X-Patchwork-Id: 45282 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8306NgE001696 for ; Thu, 3 Sep 2009 00:06:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753879AbZICAGU (ORCPT ); Wed, 2 Sep 2009 20:06:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753872AbZICAGU (ORCPT ); Wed, 2 Sep 2009 20:06:20 -0400 Received: from mail.atheros.com ([12.36.123.2]:48322 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753828AbZICAGT (ORCPT ); Wed, 2 Sep 2009 20:06:19 -0400 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Wed, 02 Sep 2009 17:06:22 -0700 Received: from smtp.atheros.com (10.10.18.125) by SC1EXHC-01.global.atheros.com (10.10.20.106) with Microsoft SMTP Server (TLS) id 8.0.751.0; Wed, 2 Sep 2009 17:06:21 -0700 Received: by smtp.atheros.com (sSMTP sendmail emulation); Wed, 02 Sep 2009 17:06:21 -0700 From: "Luis R. Rodriguez" To: CC: , "Luis R. Rodriguez" Subject: [PATCH] ath9k: claim irq for ath9k, not ath for pci Date: Wed, 2 Sep 2009 17:06:21 -0700 Message-ID: <1251936381-16886-1-git-send-email-lrodriguez@atheros.com> X-Mailer: git-send-email 1.6.3.3 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 --- 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 bc4bc2c..8bb286d 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;