Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4617529pxj; Wed, 12 May 2021 09:20:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaaWI74xFXI/PFTEuEHyn+tYVNS/cJ7i/pyXAWKI/N3f5mXYlUH7j0QqzmK8KOWAZX8gAT X-Received: by 2002:a05:6512:2342:: with SMTP id p2mr25719456lfu.388.1620836406200; Wed, 12 May 2021 09:20:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620836406; cv=none; d=google.com; s=arc-20160816; b=bDJqGe+0ggACqA7c4yJUnND88aK//dxbIR6hP8viYsk58qtjCXU3ToWsXRXe8hUZb7 zM3golMI6V4FeN7u9f9yPH6AbQAwsdQO5ePAHzm8lzf8jCkw9aTdBFaHuT+Mv5BVnipb tNfQl/6+ycbflZ1ktOdqoWITvXjEO3i/QLqdoOqk0Nu/x6EbJBWn1As27YAode57g7g7 vUuPDUB7Pk/nJl0yWoe9grivvLi0OppXDC2+cAZm/fZJcHqFE3vNGJjCaMk0Mf4pwNlm ZHJiaxmiw//pxE3tEwIRDQMj6dAWk5UOUDjPfs85vp2UuqVKsNQjombAhuk4XJxK68fS kBlQ== 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=BRq3+FYUhHNzhQXzEsp+SWmy5UwlwxlAOKlWUGkfHGk=; b=rtWYHE/a6do0y/hCnu219JlxzZzXVCeUPlYltyW5b0l3aETBEEx8qwQvoW1LIEoeah yWoo2Su48VbkoBna6RE3pcxfBp8kYwDbJn5rw0HaogihftHP4BN5X5nx4sjJQGL7DCLT duaQG42hx3z0YYGbTA3HmoJtD9DTxKBW2plsBJz4zEcgH4W6tbPk6BJexzAVzEGIN5Yu Gi7P2ZsCwa2r0LFEbqNE6M5+Dzqhjhqbj5DnyqfWscPkBwCP8z1RQxUKmS58n6lqKsc/ cDgjDgUZGv2i3//ryyt/6cqeP0ReUfS1jRe6bNtwIF52pJroc5PIHzkspN2bZdGJro7A u5uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=acL5P4ng; 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 c8si113066ljf.535.2021.05.12.09.19.35; Wed, 12 May 2021 09:20:06 -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=acL5P4ng; 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 S239800AbhELQQE (ORCPT + 99 others); Wed, 12 May 2021 12:16:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:48196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233341AbhELPcu (ORCPT ); Wed, 12 May 2021 11:32:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D469D61977; Wed, 12 May 2021 15:16:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620832603; bh=cNkD7QY51/402Wi/3aj0ittlMuaQAXew+IMlUx3lLBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=acL5P4ngTcASoqms6N5fRysMaOaBBhtp1hVOdvbrGN6yTbeR6DsYtRMN9ucktdy6f N2cYPJz+YuF/VHXh13UHdKczGmuNWGUgQ4oyvrUuvgZINiNynYl4/I5KDQ+h90eSEe ozmiO5FUBVdVHC8MgDUZEUvlguUiW4X939o2Dm4M= 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.10 330/530] scsi: ufs: ufshcd-pltfrm: Fix deferred probing Date: Wed, 12 May 2021 16:47:20 +0200 Message-Id: <20210512144830.654604574@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144819.664462530@linuxfoundation.org> References: <20210512144819.664462530@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 3db0af66c71c..24927cf485b4 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