From patchwork Mon Jul 12 06:09:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 472841 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2644105jao; Sun, 11 Jul 2021 23:23:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFsHPcycQktlkSwlgEb9m9to9OrPwISlhZWol3sfBTDRCDusW6Pte/gAftV9MVP3fV7hpn X-Received: by 2002:a17:906:4c89:: with SMTP id q9mr14642012eju.118.1626071020143; Sun, 11 Jul 2021 23:23:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626071020; cv=none; d=google.com; s=arc-20160816; b=DOVRXiV3rVdm1kzMEbBq0T0RB4UH1DpgLysQlqkHH6YcfbV2WtFt4fKrqVZq/IJp+y In5gXbRI0chZbddIboELRqpClpWv7SNUMrd4VNVlKhbKq8GEZLX5QLVXJxXq1ATiEoSz rD8FTd2akbsYjK0Z3HKAc+NK0AcGpjG87EXU3/YTtvLXw9AjSzcTCDn42d//CHb25HeM VgcDzzIn4UTLdSq+lM0OGqZ9GR3FYeoExGgr4AsDrW2wo3QGox3gqARNVBGlMpPb7pMD h+B9fGkiO5K2b5bloFfmOoGiSw9iFu/U1d1E2u2CzCBmvWFMfzH7/uMzkt3HOK4PIpEH Qcnw== 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=LmWwOCsEWJzctQfQUrSY3Ts6UrQDR55B8Kke6ulHBN4=; b=zGwEbIJEVuQXgKZEw90WnL5v708GZmJb6Ba18tpJ5kVd/CwFsLf2uLErawzp+JggNB RI0KIO6fXqB7OaifHaPgki9vMFpTsdgmbi6b7cZNGSX2lJtSoz6t35zGDtzMvDeuKnM0 MQIcIllHR7HgMUUUWTOc4fPrbr6zvC8l2PzjUU9oDpRRUjO/6px0HN+GdBGmd33XM1JG 0hfYQiAERsGokdv+RAimPWlxxHOrbZsKvzvaHS2zKnDX9wv2/HWLDtpLP1TqWI9bJGdq bdw8v13woqfoaJBt/ckmNpY/MIKEcJEzCJsXuuOb3KHqXOqF03iOO7Da+LR+67m/PI2S DpGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tHzsNy1M; 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 cn9si12706728edb.505.2021.07.11.23.23.39; Sun, 11 Jul 2021 23:23:40 -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=tHzsNy1M; 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 S235296AbhGLG00 (ORCPT + 12 others); Mon, 12 Jul 2021 02:26:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:46882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235062AbhGLGZ1 (ORCPT ); Mon, 12 Jul 2021 02:25:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 21BC96112D; Mon, 12 Jul 2021 06:22:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626070959; bh=U2hnAXVGH7qKphcmLp2nGecuXZQb4Qdzm8rghmgSN7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tHzsNy1MA6gLo7fyKSTFwNXIhfdEJzrhuU3UjB3c/rpxSZpC6QZdYYVoBsE6eWcjs 3rVV/HWaNrEE3NfeLlqQs1dQ4RZhyES1a+KjoBnvb3qADaeN+iI89/CKDguRXRK/I3 HneM3MPOv0AHP/aZd25Z0GdPwcNvplz2lw9YopYc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Ulf Hansson , Sasha Levin Subject: [PATCH 5.4 161/348] mmc: usdhi6rol0: fix error return code in usdhi6_probe() Date: Mon, 12 Jul 2021 08:09:05 +0200 Message-Id: <20210712060722.323145472@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060659.886176320@linuxfoundation.org> References: <20210712060659.886176320@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 2f9ae69e5267f53e89e296fccee291975a85f0eb ] Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 75fa9ea6e3c0 ("mmc: add a driver for the Renesas usdhi6rol0 SD/SDIO host controller") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210508020321.1677-1-thunder.leizhen@huawei.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/usdhi6rol0.c | 1 + 1 file changed, 1 insertion(+) -- 2.30.2 diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c index 6eba2441c7ef..96b0f81a2032 100644 --- a/drivers/mmc/host/usdhi6rol0.c +++ b/drivers/mmc/host/usdhi6rol0.c @@ -1803,6 +1803,7 @@ static int usdhi6_probe(struct platform_device *pdev) version = usdhi6_read(host, USDHI6_VERSION); if ((version & 0xfff) != 0xa0d) { + ret = -EPERM; dev_err(dev, "Version not recognized %x\n", version); goto e_clk_off; }