From patchwork Thu Apr 26 12:35:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 10365901 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1B4B660225 for ; Thu, 26 Apr 2018 12:37:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D18429000 for ; Thu, 26 Apr 2018 12:37:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F41CA29117; Thu, 26 Apr 2018 12:37:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D02D29000 for ; Thu, 26 Apr 2018 12:37:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756013AbeDZMgt (ORCPT ); Thu, 26 Apr 2018 08:36:49 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:43401 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756008AbeDZMgl (ORCPT ); Thu, 26 Apr 2018 08:36:41 -0400 Received: by mail-lf0-f65.google.com with SMTP id g12-v6so14394658lfb.10 for ; Thu, 26 Apr 2018 05:36:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=coF4UbdUgvzp6nD3oFxT1WsOX8qwLY1UtdGpfo2Rnes=; b=LDc1YISQA3KFkSQK+7f3MrA04rbZ/xizH3bfiPmIJmBlckjaUBUwOMzcdSBs6Au08c hnLdG+8Yl6YFpuhkyLTttiytCRBCkozIi9N2YkcnwQFP+RWzpG4oqTe/M4H6UFFJh4/H AF0vfMG521gKjW7Zq6PFWmdiK4dCQz5c4wX9o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=coF4UbdUgvzp6nD3oFxT1WsOX8qwLY1UtdGpfo2Rnes=; b=TC4qeYkbgSefxr24ayUqjH4rPr6NmsqrvlcoQjwZgAvGPlDzuBRUt32/BJ/tVtSh0L jonYBGf2YsjOOGnZ81MNZO6EJXPKLAYKieS6YK8Ek0+hHzmdSdENRCwziU9E4gUKg2NB hJEzApYT0lwtdAgaZF01IBpgAkrDKG2ydwkrB0SBpYstVGAm1umT6g7uqW7LPV37O2a0 Z/J4IKGTHrwRk9N/Cev4pofo+BW+/RKgRdjpOLUnLDV3w64pDihj1Nd10zUdSlBZOGFz qHPKcPOAf9DBqpjfaMOEYOcv98kot0bv+tVsFvRRhxoLIsspZP7kbxG3BpTsNr9ec2YW 3cPQ== X-Gm-Message-State: ALQs6tBdanT61n55BvPTn6fqHcCqlFLpDFDW1TiZouSRx/n5yBDXt9jn 2c3mTniglsBm8+sAePLwPg0HZ08gcMI= X-Google-Smtp-Source: AB8JxZonaoRBUah7N1C2zvkEXsRGK1eRzppXlB8UsdoL26bAuItWEMa+E8K3KzRqc1udwQo2+j5okQ== X-Received: by 2002:a19:b2c9:: with SMTP id t70-v6mr16113340lfk.70.1524746199770; Thu, 26 Apr 2018 05:36:39 -0700 (PDT) Received: from localhost.localdomain (h-184-10.A323.priv.bahnhof.se. [155.4.184.10]) by smtp.gmail.com with ESMTPSA id d127-v6sm4384140lfe.64.2018.04.26.05.36.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Apr 2018 05:36:39 -0700 (PDT) From: Niklas Cassel To: Kalle Valo Cc: Niklas Cassel , ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ath10k: sdio: jump to correct label in error handling path Date: Thu, 26 Apr 2018 14:35:02 +0200 Message-Id: <20180426123502.23962-1-niklas.cassel@linaro.org> X-Mailer: git-send-email 2.14.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Jump to the correct label in error handling path. At this point of execution create_singlethread_workqueue() has succeeded, so it should be properly destroyed. Jump label was renamed in commit ec2c64e20257 ("ath10k: sdio: fix memory leak for probe allocations"). However, the bug was originally introduced in commit d96db25d2025 ("ath10k: add initial SDIO support"). Fixes: d96db25d2025 ("ath10k: add initial SDIO support") Signed-off-by: Niklas Cassel --- drivers/net/wireless/ath/ath10k/sdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c index 2d04c54a4153..d612ce8c9cff 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.c +++ b/drivers/net/wireless/ath/ath10k/sdio.c @@ -2011,7 +2011,7 @@ static int ath10k_sdio_probe(struct sdio_func *func, ret = -ENODEV; ath10k_err(ar, "unsupported device id %u (0x%x)\n", dev_id_base, id->device); - goto err_core_destroy; + goto err_free_wq; } ar->id.vendor = id->vendor;