From patchwork Mon Jul 19 14:49:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 479927 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4239011jao; Mon, 19 Jul 2021 08:36:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcuM9ziGXVppnh1ugd969LBxGzw/azvnXqZjFrIy1QBGYbBI+NDYx3PG8zXQUucw7YPBTI X-Received: by 2002:a05:6e02:114f:: with SMTP id o15mr16530908ill.255.1626709003689; Mon, 19 Jul 2021 08:36:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709003; cv=none; d=google.com; s=arc-20160816; b=zF4r2/HYpfnLPcQaI/wRm4UFF9khKm/65t8Rwl6vC0Z32tMx1rCRRJuXO097+X/DIM r0ZdYvA2qM9B8rm70MqwgxwjEMpEQYXvuNobJFPPKrrJa/cu8F+ixuPDPqSH7x6jp8m/ +vkekFDJWKkvqA/kZu3erRUxRtMe5WY8FGdcJHaxp8FNm+fRZCVj/Olhxg2nTb6X4oIN QVIm8XWINrsy6kPaQfGigz+cyeyK2osN3TW38aB/pCmN5lsjlZbqN2CcLolsD9Bf+3xZ v+ZXwRsj320ZLT5vuRxY0/8n3H6kb9RPMPO5NAVGk7OeFcciGeoBL0TLt09MUUUGQlhL i+wA== 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=48bGOEWqDUEjpvJryHPrpMpj+dD+udNDqnQ2vP5/fWs=; b=cRlppqQXVOxH8JHYx9a/ud9bq+YMab7thEwur0afNOgxueD4vn8uYg/2euc2xNGxbx 7Oze1v0xMewveZKQCBi8Q3nzFEH8tT/hSILgP8yDTcGQZWmFrtQKXZurXWiosAY+Um69 Ak/nWVJo+F3Z6s4myOiL1+xmUt0IIGJSsq/Ft7dkiiehaBrJJHNET7x03W1+tRfiSkmW OCXAdHaX9dp37+5Sf4E6r7REVRe3R+ZF3g9S/BvSuLk24r6fNoWcLSdg7pq5MY8ifiNP 0/qAg4GNNUqzQQulreauRGFWVFK3SDt67rtuDUdmXZypO620IDMB6hx+o7RIe9M/gNoR Qxqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YToZWnuT; 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 h5si23669220iol.44.2021.07.19.08.36.43; Mon, 19 Jul 2021 08:36:43 -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=YToZWnuT; 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 S238616AbhGSO4C (ORCPT + 12 others); Mon, 19 Jul 2021 10:56:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:45208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238789AbhGSOyB (ORCPT ); Mon, 19 Jul 2021 10:54:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F7D661285; Mon, 19 Jul 2021 15:33:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708787; bh=C0/WtTy7uGcfywJh/Bg7FSsNQVVNIIPRGXcN/8bDiWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YToZWnuTrOs4Y8nHDqW2J6Vj2ISczQGNE2FD6s9cVUjLvn+cSDdsBjpM735waIaFd Lj3R+gBprqqJh4AyHI3ZHtydtR5TsxNUR+NNJQjGr30E9F952iBnWqW1t5MdDHeCTK dlidLfje8/28uRdcAQzUQMvsjrw0BXrx3dj9+GR4= 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 4.19 130/421] ssb: Fix error return code in ssb_bus_scan() Date: Mon, 19 Jul 2021 16:49:01 +0200 Message-Id: <20210719144951.033376112@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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 6ceee98ed6ff..5c7e61cafd19 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) {