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: 905048 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="LDc1YISQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40WxQf4Rb6z9s0W for ; Thu, 26 Apr 2018 22:36:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756056AbeDZMgy (ORCPT ); Thu, 26 Apr 2018 08:36:54 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:34308 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756010AbeDZMgl (ORCPT ); Thu, 26 Apr 2018 08:36:41 -0400 Received: by mail-lf0-f68.google.com with SMTP id h4-v6so3701602lfc.1 for ; Thu, 26 Apr 2018 05:36:41 -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=hEiCkCGZQQawsN0/P5eGEOCeNyKDyKp241pByNJkgXJ738Xesj57XddO2ZgKRzaYyt 835212k4IfMlIa9ojI9GzTcXNfm+xskIuvs1jbpxGJF4PNdMijrRK5pwcXHP9CQffmo8 Yc8Bvb2Vl4YbCN48dfzmdtG6/OGjkkNQGpcZakOA/P/qKeG1W/5cVkkhX2nwOL1sF7hr lcNKkgpgNVLQChqRXN4K5bHYswkzwkpQjYjw83Rvc0G3tlEGmgv0DtvqzYtnmoSYINDe uAivc7mHWRjlJUmzi6wOW3CAqcEwLn5LMaa3Pd+a/J37xkM2CTEhuHikuOgAcmC5wGbP ITiA== X-Gm-Message-State: ALQs6tDUHEdLdvmTOB23Nojaosbalf1i2vD5b/0SG0ROIYxYj6CGRxur Z4jA+dds2Vu5AJcsnbSv8Ddqqw== 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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;