From patchwork Wed May 12 14:47:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 435541 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp4904484jao; Wed, 12 May 2021 07:57:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzA10SyRGFbK60nnUlu1JmtZxGGSbXuHqseoSIut54z+aRywmBFcYNZT1s1X6aHxp7FWiWS X-Received: by 2002:a92:c846:: with SMTP id b6mr27117970ilq.68.1620831470360; Wed, 12 May 2021 07:57:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620831470; cv=none; d=google.com; s=arc-20160816; b=NeL/wnofezfrWziKUePlGNcIY5uj4uq8wc2MYDe0vBtq/Hw/cFyeMuIBHVLTmwyu0u tGiHukQ5PPqFV6wELmGQFpUQn1azjBCWWcdNJvnXKkXLE7AhUmwE6RcbY53bLBDztFrx EnOS1LkOoPNgvLU9EtSYDi2CZd0LcDXTJvIupqre75JhOoOWr9V/dqwv1hsLwJ3J2xQ/ ph4v2a+0ry2rQd4jMJqdgvgyk91ezH3wLN6zK0/SlQ8f2XKtDONX7Kct4gE8+MhJvP2U Xaqv5eE6Vq9DPZbMwG9d/IZ213FvI1UEXWsKYxhlNn9up4RfOPoWD8sRdg2vWWdLfPg4 pEwg== 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=SYO0OnPziKiMT08xRZRhCkqsu29YFdebsB7V3ciFnVY=; b=YVBTyjRqPQXwl/DK6dvctcWpfLnE645+bX3jbKFtildIF/x+q+g6VAuiJGH3XK8YC0 IK7AoIqiWCAIIgyjiLB/CQWu2WtMjg+QQU6DxVwYIfo3obUAdeyirPQK+7jmmsmmlzS8 uwZD+I/N6GcM+dd4pp3m58itC6jN34O6UEWCnAd8gJiM7k7B1d0HBmLUsDsEZ97z0oeO E+n/K0ucZQBWDyfRn2P3fBSBqWSmAKI1IwLtyVJjZRZsKAoF8sEQNlRGJlYNkFCBi0fb We7NRjxUM1hAjyJ2aa/I4rYVELo5kmDwdR2Rhl+Ej+kbWYUH9cjKsmsXuP+l5AZSXDvO cH2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fIyxkVqE; 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 k3si22736552ilc.30.2021.05.12.07.57.50; Wed, 12 May 2021 07:57:50 -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=fIyxkVqE; 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 S232430AbhELO6v (ORCPT + 12 others); Wed, 12 May 2021 10:58:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:47322 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231633AbhELO5L (ORCPT ); Wed, 12 May 2021 10:57:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5131561413; Wed, 12 May 2021 14:55:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620831338; bh=/pXEdHyVponq2LhPnWDLZ2uzzOfZ8EHWJA+SVhcPEMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fIyxkVqEQySu50N4b3VhWsBbG6QRcRwaswAjRUyCyaG0IvJjlX4/TImOOBKKVmDTW eCcFOWMYkgo5jjn7qlcU+8MISMJhVlp5JXoryHyhU/Or96KMD3V887xysDM1KFklyZ 7aU/LA9T5r5lre7AHQI+HdhsPJApE2EfnkVRs+sI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Manivannan Sadhasivam , Miquel Raynal , Sasha Levin Subject: [PATCH 5.4 079/244] mtd: rawnand: qcom: Return actual error code instead of -ENODEV Date: Wed, 12 May 2021 16:47:30 +0200 Message-Id: <20210512144745.560142809@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144743.039977287@linuxfoundation.org> References: <20210512144743.039977287@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Manivannan Sadhasivam [ Upstream commit 55fbb9ba4f06cb6aff32daca1e1910173c13ec51 ] In qcom_probe_nand_devices() function, the error code returned by qcom_nand_host_init_and_register() is converted to -ENODEV in the case of failure. This poses issue if -EPROBE_DEFER is returned when the dependency is not available for a component like parser. So let's restructure the error handling logic a bit and return the actual error code in case of qcom_nand_host_init_and_register() failure. Fixes: c76b78d8ec05 ("mtd: nand: Qualcomm NAND controller driver") Signed-off-by: Manivannan Sadhasivam Signed-off-by: Miquel Raynal Signed-off-by: Sasha Levin --- drivers/mtd/nand/raw/qcom_nandc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.30.2 diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c index 963ebcdfcbce..c10995ca624a 100644 --- a/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c @@ -2850,7 +2850,7 @@ static int qcom_probe_nand_devices(struct qcom_nand_controller *nandc) struct device *dev = nandc->dev; struct device_node *dn = dev->of_node, *child; struct qcom_nand_host *host; - int ret; + int ret = -ENODEV; for_each_available_child_of_node(dn, child) { host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL); @@ -2868,10 +2868,7 @@ static int qcom_probe_nand_devices(struct qcom_nand_controller *nandc) list_add_tail(&host->node, &nandc->host_list); } - if (list_empty(&nandc->host_list)) - return -ENODEV; - - return 0; + return ret; } /* parse custom DT properties here */