Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2829907pxv; Mon, 12 Jul 2021 03:00:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+dPTlFrYIaW5+cZjY54/rQvFgbJjUtohMe1EGNrQYt3zYT0RxsNqIIujH+XjzcE7rORiq X-Received: by 2002:a50:fd1a:: with SMTP id i26mr16918675eds.372.1626084024959; Mon, 12 Jul 2021 03:00:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626084024; cv=none; d=google.com; s=arc-20160816; b=IiB5F74l0zScZuZQFGcnn4cv17JbKzMMHr25ffSTlhf7njcyfEdI1IRCNtYNDrHxbm MSN1aLj7skeb0Z9jH6R1PVNfE71isnFNlyv/BQRbRlwgoLFxCWFtYMkOneXJKciHB4/Z xll9Ni6bL+EExbUAVssIv6m9C/MRoSW4phLKFvpG8G0EO3/KO5kHTvG77CCnmuvFxzg6 3tnErmmKT5x6pdHVyRB6x13P64Jt4SYWT5L6LvF7L++rW6qclzyrnfqU0mfPj/6uCW1X vlNkGJfYNvPZguIvHMP4+VrejyS6zX5X11YDopDj5rMB7GjckN+3Wf0d/aMsYgszzlIn 3T1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vEOCfNxiWZoaVQbchUHJZs7lfY2P/5FpMSii5ZaAve8=; b=Rig3tJ3eVQv9CO4KTLCmmBQywJBEhmzGxaivUShTCZwt+iStgLZqFOjW5FiLQnuApN 8WuXqqRPGzB92PI8lOgVN8OiPuHoK6zqptA2ZuXqk+ttjcEtc4Uks88/rUG7/h+Ex+4v BlR9Be5xOJ30EzyqjX8n4Yp624Jr9kuOMbZOdO139syPpmqjELBbIF9bIG2GUAkGitcZ pV2HDEI6VkYDYi6VvBFf9Gw6fsOZukPRRPGHqT5BC50/x68qo3b05l8gk3cy1sPQ2LvY vD6OICnNTf2Ip116TSP1rga37QlAl4e1ojxLxq48mZ3YJAISRf1xf8wj4b1iHAB0bQYe A5YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ieGN5drT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b23si3483838edy.354.2021.07.12.03.00.01; Mon, 12 Jul 2021 03:00:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ieGN5drT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242780AbhGLHEL (ORCPT + 99 others); Mon, 12 Jul 2021 03:04:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:41508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237187AbhGLGqt (ORCPT ); Mon, 12 Jul 2021 02:46:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A7A4A6113B; Mon, 12 Jul 2021 06:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072154; bh=RbUQ+fDtKd5nZBrJx4XGFRbRXRwuWcygjPjRHOCNcTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ieGN5drTQOIyrhFKPaMTb4lWbrQuNeRINsE5IokBjj+JbcBsWHCo5xppS/hV3ohSQ Krdl0FTdCypx+PhTlZXeA5Aup2ZAEFE3ZRfoEcApb7OkZVLPtA5ZssmrmG5uInvKo4 n0OmpnH6NcdlJjvojyPKdzPnbtfDzdDh6nbKAKpY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yang Yingliang , Kalle Valo , Sasha Levin Subject: [PATCH 5.10 340/593] ath10k: go to path err_unsupported when chip id is not supported Date: Mon, 12 Jul 2021 08:08:20 +0200 Message-Id: <20210712060923.409072040@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Yingliang [ Upstream commit 9e88dd431d2345acdb7a549f3e88aaf4c2a307a1 ] When chip id is not supported, it go to path err_unsupported to print the error message. Fixes: f8914a14623a ("ath10k: restore QCA9880-AR1A (v1) detection") Signed-off-by: Yang Yingliang Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20210522105822.1091848-2-yangyingliang@huawei.com Signed-off-by: Sasha Levin --- 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 36426efdb2ea..55f483d22b6d 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -3700,7 +3700,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev, goto err_unsupported; if (!ath10k_pci_chip_is_supported(pdev->device, bus_params.chip_id)) - goto err_free_irq; + goto err_unsupported; ret = ath10k_core_register(ar, &bus_params); if (ret) { -- 2.30.2