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: 134513 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2251266lji; Thu, 26 Apr 2018 05:36:53 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqtfx5rW0+IiBd/0lpkplVVucJzcdUqW4lQh9M6MGhRKr+61lcrNRu0D8usWKbNjt286TVO X-Received: by 2002:a17:902:d886:: with SMTP id b6-v6mr10490846plz.278.1524746213035; Thu, 26 Apr 2018 05:36:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524746213; cv=none; d=google.com; s=arc-20160816; b=q0gVYePTaPBmeDf/m4izVZdWNAS/b6vc25mll5t2hll0M1/AzDcCjhcm7TUL0+++4A vNAGbgq484lK/QE9MO40PIiLEoLlyhhldAW0a9FVEeZq3tP10V7I/868koN19fQpKA2x mPS6Z7Isrtmu/zelvzvshhcbGPToITgzSQqW7j4kwSxd0qcOq4eg1kxxsa8GcyBJ2k5+ 5wkixuHMGXwq+dT+5PRwl62NeuSkD6CjPZj4iTWLguvyW0p4sYOAheyqeSQcMHVuseRj 64Ir9kK1MwHE2dm8q3xxLNhB6cRFhMNE7L3fZDHWVfqEqFvtn6BDnzy7mQfeUzPKJRH+ RBxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=coF4UbdUgvzp6nD3oFxT1WsOX8qwLY1UtdGpfo2Rnes=; b=tQlUlRijtHYRR2MJZ5blL54xv8ejdbnx3APb4vpuyQBaanfaIf6VR2EhALEaKTyFtG wv7iprZsQU4cTCw1c+g3XDT+ju7V1EvX4C+aFv5QwMsdiG7UTv8LK1LVKzO/thvAgkPM G1veP99enWl/zR8RDn9FKKIA2DadDz4bnppMrxcVzH5hdQjU8S4PIx97bwJAP0d81om0 URhaJYqKZ2L1Q7gO9xfyAa7V0v1D7uVHYH6+JU0gcK526ppHtwE2oO7S99g0ZHc+v/Ca wMGPXArNcMo9YBa/mkFhaw3Tfqn6cmd/6CgXacD54qiTR2/Q5zDbNz4jkhLsK8aDUk5e /uvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LDc1YISQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v2-v6si19055427plo.138.2018.04.26.05.36.52; Thu, 26 Apr 2018 05:36:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LDc1YISQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756046AbeDZMgu (ORCPT + 29 others); Thu, 26 Apr 2018 08:36:50 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:45975 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756009AbeDZMgl (ORCPT ); Thu, 26 Apr 2018 08:36:41 -0400 Received: by mail-lf0-f66.google.com with SMTP id q5-v6so30452577lff.12 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=s1z+21jTgibtcoMalHpP5qq4FkueENvETfgbMIcJI9oFNqTVezuM0sgAlhG677eB+y v0BZeF51MBKDG0rX6cR1pssX9E1lcQ02SFAXWwZ+6hQiAn0VtNnLPMljEUT/h3rfxFyT 7lgovYGS684FpnmXN+KCcNYfud076INyIAFuocMxYLk6kS1e1XWGBFsmQYN8Q12I7Acl zPx82zc7o6wmE983UZK+z0i5jOluVaD2LB0K4flyG81afH/plWo5X7QfzwmgFLlYrpte BPbLsGeutY0jIUfBScU8YTp+VzKPT5zV2nVTsTFeAbxJZDiCmfqa7aSLLmd8EVS4gaZN BpIQ== X-Gm-Message-State: ALQs6tCEpD02AbfLTHOhZ322+SfS1A/QEUfYP6Y6eG5uNLtT6iLUW46a dJl7MvHHWGaiFNmMqCVSJBP44g== 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) -- 2.14.3 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;