From patchwork Wed Jun 26 06:50:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 2782981 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8BD009F3A0 for ; Wed, 26 Jun 2013 06:51:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C14222011D for ; Wed, 26 Jun 2013 06:51:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4BF242010B for ; Wed, 26 Jun 2013 06:51:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751271Ab3FZGvZ (ORCPT ); Wed, 26 Jun 2013 02:51:25 -0400 Received: from ebb06.tieto.com ([131.207.168.38]:50835 "EHLO ebb06.tieto.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750886Ab3FZGvY (ORCPT ); Wed, 26 Jun 2013 02:51:24 -0400 X-AuditID: 83cfa826-b7f2b6d000001c62-e6-51ca8f6a0701 Received: from FIHGA-EXHUB01.eu.tieto.com ( [131.207.136.34]) by ebb06.tieto.com (SMTP Mailer) with SMTP id F5.90.07266.A6F8AC15; Wed, 26 Jun 2013 09:51:23 +0300 (EEST) Received: from uw001058.eu.tieto.com (10.28.19.57) by inbound.tieto.com (131.207.136.49) with Microsoft SMTP Server id 8.3.298.1; Wed, 26 Jun 2013 09:51:22 +0300 From: Michal Kazior To: , CC: Michal Kazior Subject: [PATCH v2] ath10k: fix MSI-X setup failpath Date: Wed, 26 Jun 2013 08:50:50 +0200 Message-ID: <1372229450-4575-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1372150661-6862-1-git-send-email-michal.kazior@tieto.com> References: <1372150661-6862-1-git-send-email-michal.kazior@tieto.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsXSfL5DSTe7/1SgwYMmJotNS+4zWbxZcYfd 4tvWB2wOzB6fZ95l82iY3sXu8XmTXABzFJdNSmpOZllqkb5dAlfGnrOX2QsWslfcaDvL3sD4 h7WLkZNDQsBE4uaB5VC2mMSFe+vZuhi5OIQEVjFKPP13lxnCWcoocWjnV3aQKjYBXYlXjWeB Ojg4RAScJR5O5wAJMwtoS7S/uQ42SBho6N5t+9lAbBYBVYltJ9cxgti8Am4S07ecZQRplRBQ kJgzyQbE5BRwl9ixQwCkQgioYueSj1DVghInZz5hgZguIXHwxQtmiBoViYPr9zNPYBSYhaRs FpKyBYxMqxj5U5OSDMz0SjJTS/L1kvNzNzGCA3CF2g7GZw+kDjEKcDAq8fAqbD0ZKMSaWFZc mXuIUZKDSUmU16/vVKAQX1J+SmVGYnFGfFFpTmrxIUYJDmYlEd78G0DlvCmJlVWpRfkwKWkO FiVxXmbHw4FCAumJJanZqakFqUUwWRkODiUJ3tu9QEMFi1LTUyvSMnNKENJMHJwgw3mAhsuD 1PAWFyTmFmemQ+RPMSpKifPuBkkIgCQySvPgemEJ4hWjONArwrwPQap4gMkFrvsV0GAmoMGT U4+DDC5JREhJNTBaz+8LfaNRyBm0zSF2ftDcnM1qlmEhvLnmz84ft361aguT0KfG9ZOsVjTv fvljZYHVpYeF2npl5f6H5GVt5v/hDo0WTN7waGbPifR9C896ZlgJbvh490bqNcOJUvuldY+m +MwXOv46t/Co8zIrxT65k2d6OSV4VVbPKK3+M2f7ohm5sz/+ZU1WYinOSDTUYi4qTgQAk2A5 LesCAAA= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Irqs were not freed up correctly upon msi-x setup failure. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/pci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 1a59638..63c58b5 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -1882,9 +1882,10 @@ static int ath10k_pci_start_intr_msix(struct ath10k *ar, int num) ath10k_warn("request_irq(%d) failed %d\n", ar_pci->pdev->irq + i, ret); - for (; i >= MSI_ASSIGN_CE_INITIAL; i--) - free_irq(ar_pci->pdev->irq, ar); + for (i--; i >= MSI_ASSIGN_CE_INITIAL; i--) + free_irq(ar_pci->pdev->irq + i, ar); + free_irq(ar_pci->pdev->irq + MSI_ASSIGN_FW, ar); pci_disable_msi(ar_pci->pdev); return ret; }