From patchwork Mon Jul 12 06:08:04 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: 473025 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2703049jao; Mon, 12 Jul 2021 00:55:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxi1nxTGZ7Rit9SsR03RGuIJ+nXqN+MHcoTK7B5hA3Tg77oYEI9gdg32RqJJxM2nuxY4xeg X-Received: by 2002:aa7:c782:: with SMTP id n2mr63785521eds.77.1626076521719; Mon, 12 Jul 2021 00:55:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626076521; cv=none; d=google.com; s=arc-20160816; b=kax7zdoZywNeuAJpdXPD3NOXTKqN7w1louBlqXn3airHMymiaBtTGZLvrwBrHOSGw/ jEdJLG5w2olg8sQO7lGAU8NCFuPouE193EDulZA4mP53wzTy7vnMoM4mZbnLhJaVqhSG OppMxlcnRX41xvWCJ0f7exRarKQmBMGMgWmlqWSl98NvCYxOa3y5TXhK0oOmHtQxCi7R HJaRqHFS6nKN06VjQD7OdftgNkxEEEYYAo9GLQKtSFuoYbUswv5TuNhnDhIGJeva9wVA hSrRqlgmFWDwRueCPlWvjO6hwsKssYLH6rBEjSpjknHw06ORi8iOm6iae8M4fAvPWvSF y8ZQ== 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=SLFqc5Np4QcgCxIKVpISc3hIsPO/A2K/UVby7iHo+W8Y7Ajl9oNgdXG3Ni+83DGKcQ jgBC0NJuJFwLiM5P1wu5BKEKg5B8+4C/VXmLSqPmFmCTFQ7NISitWIayzkkVO9Gkg7Sp rPOC9dZnDaNlS7pFoeeo4HWDWqFwCG85w5PgbBfDGbYuMxhb3Pc6DB0nmIYUr+D/A6It E0BFmEtKD/MWsKhpAaw4iBOeHQHPhpQPpdadMiVEEUVKwGCi4qEX4Xe9xO5HYOvwThqb lbHHENB15MrVdThMLewF5FviNtgaEXn4eNMXL56hKfC+LuUwqfx6LATOtMxzA10V+LfC IEpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VVgwKIX1; 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 n21si13642925eda.13.2021.07.12.00.55.21; Mon, 12 Jul 2021 00:55:21 -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=VVgwKIX1; 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 S1348565AbhGLHzu (ORCPT + 12 others); Mon, 12 Jul 2021 03:55:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:35484 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350649AbhGLHvM (ORCPT ); Mon, 12 Jul 2021 03:51:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7200661C28; Mon, 12 Jul 2021 07:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076015; bh=HH/oR1MAak1gZXBUdVPQsHiHbw5NhvczZv1qs8GQY2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VVgwKIX1cKFUG/emqwFs/176f2DcVEAgws53lGYRZCjz57aebmW6o6ZrOgTqokwx5 dmKBToon9R6VGrJ2RVuD3oQUxo4r96ZdGYfu7G9Y+tSPYQBxVMCHPudeK0u4buyXhj i4G0h+/5HE3Uqvl1TRLyl+WjRAlXDMZYE7/rfBj0= 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.13 461/800] ssb: Fix error return code in ssb_bus_scan() Date: Mon, 12 Jul 2021 08:08:04 +0200 Message-Id: <20210712061016.197375381@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@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) {