Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4683071pxj; Wed, 12 May 2021 10:47:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCyJngvaRKKyWltPMe0htIg1hFkl33NXQ64bDfhof/ctaUF6Vb18dDo7pjEvRGi+GTWuNa X-Received: by 2002:a05:6402:40d2:: with SMTP id z18mr43758109edb.81.1620841678680; Wed, 12 May 2021 10:47:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620841678; cv=none; d=google.com; s=arc-20160816; b=VOGKHGtQkS86Ops1YpwYKC+Q0L8L4V+2nFLOT3Vd/+RP1fhlKHt+keAfztNufY7JT2 NVZM6eMmHRAvLx3aropAoPxWf8PVkPjkKk6qYfErLwAL60+c4PJOflWVbXDc/z+3C9mT AKSZge5c+svqChYKIzRRGWWTKQkwhgidZasfz2zfFy+YN0VopUKE1VmTOfYcT0ibq6RE TEIkrhw04eRd2+ZrHslM7xGCA6xi4+cSLEOhEzX7BNXafpdA2RMEKOn1SxOnqeoebGf9 lMm45xJLjtRcVrFZt9CpjvYjBMq5bDEU0DIkL3y60fEd/DSoNdq29OtEsk+XoM9EVqH4 xmgg== 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=9ZS34fa2ng/uWnNR0eb+178m5LvCU0syaoPmAgCd144=; b=YRwsmz9sTEusyOgDiQu5rw9um3JCxV5NDGY3NFWhv8gu7jP7/bC8F4Az6SYM3XPC3p I4AogQUItc+ol+ztUMNeAgTWH2ohQ1f9NVWFRHAgcH+9DZ9tL48HRez3x9ztlJTWGGbT E/6rN1Qmoj+2EDvvyLjmYr/13/grDM91sP7m5pWLq88O8mfviszwWJqBbNI1J9h1ezEx jsX5v1zL5v/uqDN3oSwzgCIh4pmYtQoSuHxmA20cnoOkwWAgURG+YUEje4odhmzYRhXc lXNDx7WEHVf+vqW5nPth6oRCHYWb7xtH4LRDd6Dr73w/tCO70Ty7GmzK2OuH8/HwCBf1 UaQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2UvNnH9Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 v18si430782ejd.644.2021.05.12.10.47.34; Wed, 12 May 2021 10:47:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=2UvNnH9Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1348495AbhELRh3 (ORCPT + 99 others); Wed, 12 May 2021 13:37:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:33528 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239629AbhELQKW (ORCPT ); Wed, 12 May 2021 12:10:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8DBF861D58; Wed, 12 May 2021 15:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834009; bh=gXq2paFHLFWG4gwQI7A79iLmPT74ZRQipM90epusL2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2UvNnH9Zrr3f/kbMqn6g/W7Y5F9cfdFzU3nTsbVOQBDSGZBueMHOCfrJVUYNKe6ao 0hwWNejBdiB0E4LjSZUf7t/MKIYHc7btepy0PQqCVPdxNKUyWW0+1PFg0XpEClwkv6 wccloCR2M+UO7zQhxuTYVCAE0gjBQqwxRPaugjUg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sergey Shtylyov , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.11 367/601] scsi: ufs: ufshcd-pltfrm: Fix deferred probing Date: Wed, 12 May 2021 16:47:24 +0200 Message-Id: <20210512144839.887145233@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sergey Shtylyov [ Upstream commit 339c9b63cc7ce779ce45c675bf709cb58b807fc3 ] The driver overrides the error codes returned by platform_get_irq() to -ENODEV, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Propagate the error code upstream as it should have been done from the start... Link: https://lore.kernel.org/r/420364ca-614a-45e3-4e35-0e0653c7bc53@omprussia.ru Fixes: 2953f850c3b8 ("[SCSI] ufs: use devres functions for ufshcd") Signed-off-by: Sergey Shtylyov Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd-pltfrm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c index 1a69949a4ea1..b56d9b4e5f03 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -377,7 +377,7 @@ int ufshcd_pltfrm_init(struct platform_device *pdev, irq = platform_get_irq(pdev, 0); if (irq < 0) { - err = -ENODEV; + err = irq; goto out; } -- 2.30.2