From patchwork Fri Apr 10 13:01:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 6195391 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B11A3BF4A6 for ; Fri, 10 Apr 2015 13:04:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E72A42037E for ; Fri, 10 Apr 2015 13:04:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F423B2035B for ; Fri, 10 Apr 2015 13:04:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932434AbbDJNES (ORCPT ); Fri, 10 Apr 2015 09:04:18 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:35306 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755820AbbDJNER (ORCPT ); Fri, 10 Apr 2015 09:04:17 -0400 Received: by lbbuc2 with SMTP id uc2so13120938lbb.2 for ; Fri, 10 Apr 2015 06:04:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=12xUNvQl+9t4aKeLdkd1dCMk7G7hTOQuqAMiZObi7do=; b=bLMJYliug00rrsH6cSZuSt3gWzAQ0e/QnrqFslHjDAh7czLspbO9ryhTTMXiykdSOH RTiXn0JoVjLTsd1OgfPTCTldpj0U4dy00wQqbgDVbmZHbRPogysu1JLN1WRBEmZRNboT RAFMc846FGWcnM3g+K92eYQ8J+aMDaTywLSK4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=12xUNvQl+9t4aKeLdkd1dCMk7G7hTOQuqAMiZObi7do=; b=cr2Pa0dN+13OzoQzWAH2iC92BYjtPL7xJlc0KAm6TWXXi3y2oJVyCivCTCWsSiHJbd 6GSuBsw50x1UD2Dve4Cfgs8w2gN6t4WLSGxcOFcJSh9lF97f/FjsDnh+yOn6yRiHHNi2 YRvr8qiwiZDiAjFR32T4wSENF+ocWd8WVrB8w4tdeiVNcYUMjQJY/mzL04KLUq00iZd8 TNhjrVft+AML06Yy90EydyNlwwSkbjVj3UySUmD/MPx5ta7Tyl50yduJD95f6oQF9K7D PhdY3twYXAJ9Mlm9rjpjN31SFGEGJsfUKajXgh47lk7JXiyBkDjNrzwPCEUWB+VStADB E4EA== X-Gm-Message-State: ALoCoQmY7vWTFI82788vYhvqmh8dMCLsFV7hA/ie+2HLPle229jVMr2vJ74WyXvbuzmRZlFUoGYzzCocB39a5X6yewlQ3B2lK0NpyVJ2Q5oXmVsJxxtLhM3VJaQAVO3GU/u8nE4n3iNm X-Received: by 10.112.220.34 with SMTP id pt2mr1356985lbc.81.1428671056018; Fri, 10 Apr 2015 06:04:16 -0700 (PDT) Received: from bob.homerouter.cpe (apn-46-215-71-130.dynamic.gprs.plus.pl. [46.215.71.130]) by mx.google.com with ESMTPSA id h3sm443211lam.49.2015.04.10.06.04.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Apr 2015 06:04:15 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH] ath10k: fix error handling in pci_probe Date: Fri, 10 Apr 2015 13:01:27 +0000 Message-Id: <1428670887-7533-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 If chip_id wasn't recognized clean up code wasn't executed properly. It would skip freeing memory causing a leak and irqs causing possibly MSI warning splats later or even kernel crashes. Fixes: 1a7fecb766c8 ("ath10k: reset chip before reading chip_id in probe") Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 262a84f67f62..1f770ac28df4 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -2684,7 +2684,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev, if (!ath10k_pci_chip_is_supported(pdev->device, chip_id)) { ath10k_err(ar, "device %04x with chip_id %08x isn't supported\n", pdev->device, chip_id); - goto err_sleep; + goto err_free_irq; } ret = ath10k_core_register(ar, chip_id);