From patchwork Mon Jul 12 06:08:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472898 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2656632jao; Sun, 11 Jul 2021 23:43:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJXNfSYEG2i765/cCsWii6qnhuKdMkC0kvU/j7iziBs3YGryK0D4xBXOJwlPFdukVih9t5 X-Received: by 2002:a17:906:546:: with SMTP id k6mr51061466eja.53.1626072239140; Sun, 11 Jul 2021 23:43:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072239; cv=none; d=google.com; s=arc-20160816; b=GIyoVqSFDn7K3ol2bJb/OcXEJT/QpTtsLV2fqQ7j2P0VhrXHNzkl9w5g5NBqKwjMAa O59yKiFo2xVRyasXkspsqDBF49yO+7j6aBo8qr1rHpazhFh0VdRuGjIXUHSv0bjcvDtc Y+cUGqrO6/1kZwj6KTIVbu1XcUXBHvENRSRrIq+/KELvNAgkiVFdb7N3GTVcHZwTxchG vAYaHOXdGz0ba9J9Nyc2v8+suIEqSdKjE2YdTVqCzYa/tHmS15unTCDicLt0SLfmEGkI t/dEsU8q+f0wia8cHPgji5w+zHDVExRbqs9/1TvL1D2XTF2SKvsgy48iodIWcoEtG/27 HVWw== 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=4gfBI2IuuIa4xSMQSxbzv5D0XetEmX5tZB9Bcmct1qc=; b=JklfSBrUPvMpXarQ4SOd6s7waE/Y+H3P+dsuj3VeUGknlGSY3RPunYj/yfCQYVbHK0 4+3qxPZPEznabs/j9FB5qFKrKI7WQo2Ht8/cE9JdrA8Y5jXMhOAh8H+GmtFsQx47D+OK UUswUC4pzr6pogV1vp0Bod7OfABUXkxRdxfGcs9T8RVu1oo2nb1rf9Hhd6FMBDFIvvGX dA+GHokrKajfYbJfXJigzeRr8v5wN3cdIzQYwB07y1d3OYZ56ctfTtS0FkjuvTL3dvcM fMy06RZoZ3b3jTBkO+CKQEGDOJXfJ4hqA9Y1dSI6K2s643WZG5SMEYLVzWaJ7qYvKb0a CDHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="k1J/siQS"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 en10si16062540ejc.118.2021.07.11.23.43.58; Sun, 11 Jul 2021 23:43:59 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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="k1J/siQS"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S235723AbhGLGqi (ORCPT + 12 others); Mon, 12 Jul 2021 02:46:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:42444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236068AbhGLGpM (ORCPT ); Mon, 12 Jul 2021 02:45:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6267061208; Mon, 12 Jul 2021 06:41:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072078; bh=HH/oR1MAak1gZXBUdVPQsHiHbw5NhvczZv1qs8GQY2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k1J/siQSJtFLpCoPCSSF+QKWFsy75Xge+LopwiRtUECzo2FpHIr4YkyvC4ZvIj0qB pHBLLMb2cD4caejDN1O8qFphTYBvw3ZSp3eMaAUYWSNWCJuEqv3op0ytEzpsFOX1mg 9q001aSK8IqaSZ4p+Hdbz9s+Ofva/lKHEDoazqHE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , =?utf-8?q?Michael_B?= =?utf-8?b?w7xzY2g=?= , Kalle Valo , Sasha Levin Subject: [PATCH 5.10 346/593] ssb: Fix error return code in ssb_bus_scan() Date: Mon, 12 Jul 2021 08:08:26 +0200 Message-Id: <20210712060924.165721204@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 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit 77a0989baa427dbd242c5784d05a53ca3d197d43 ] Fix to return -EINVAL from the error handling case instead of 0, as done elsewhere in this function. Fixes: 61e115a56d1a ("[SSB]: add Sonics Silicon Backplane bus support") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Acked-by: Michael Büsch Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20210515072949.7151-1-thunder.leizhen@huawei.com Signed-off-by: Sasha Levin --- drivers/ssb/scan.c | 1 + 1 file changed, 1 insertion(+) -- 2.30.2 diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index f49ab1aa2149..4161e5d1f276 100644 --- a/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c @@ -325,6 +325,7 @@ int ssb_bus_scan(struct ssb_bus *bus, if (bus->nr_devices > ARRAY_SIZE(bus->devices)) { pr_err("More than %d ssb cores found (%d)\n", SSB_MAX_NR_CORES, bus->nr_devices); + err = -EINVAL; goto err_unmap; } if (bus->bustype == SSB_BUSTYPE_SSB) {