From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1A23C432C0 for ; Wed, 27 Nov 2019 21:44:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9957020869 for ; Wed, 27 Nov 2019 21:44:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574891095; bh=l4vparjXE7s9TQNJo7G5ramjuZ7Osol/anGZJCpStGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vrFgwvSlb88pEZoqQEdWj5Q2MRGVcN57xRFdaQa9FxD397i6WE0J6h6FAjD7WSRNR jf5kvbrJsCwE51qM1h4fMSMAeYpnxWZKds3InFE8y8ziBYpnSu3oE2m8cdTnIUOfuo W7RAgAYjjSsyp1k26RQ63OVR8OJxpg1H2gQUH/GM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728142AbfK0Ugc (ORCPT ); Wed, 27 Nov 2019 15:36:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:38818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728138AbfK0Ugc (ORCPT ); Wed, 27 Nov 2019 15:36:32 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09E102158A; Wed, 27 Nov 2019 20:36:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574886991; bh=l4vparjXE7s9TQNJo7G5ramjuZ7Osol/anGZJCpStGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=adRNZF8KV6GKjGP/y+Smwt+ed+QdbYVqHvYIu6A7lhzVqc6X7+hgFxP+F53bjDWb/ 8SpDZpvJP0aq10Y5ZNQYjmMFF3+MDH8GCZSWWL2BNix/nZ0CCyRn02O4cAiO59Pt/A LuUtyLq7WoCwkVumaTfxERR5v8f+820b53CgnH+k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sergei Shtylyov , Mark Brown , Sasha Levin Subject: [PATCH 4.4 028/132] spi: sh-msiof: fix deferred probing Date: Wed, 27 Nov 2019 21:30:19 +0100 Message-Id: <20191127202925.272165575@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202857.270233486@linuxfoundation.org> References: <20191127202857.270233486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sergei Shtylyov [ Upstream commit f34c6e6257aa477cdfe7e9bbbecd3c5648ecda69 ] Since commit 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") platform_get_irq() can return -EPROBE_DEFER. However, the driver overrides an error returned by that function with -ENOENT which breaks the deferred probing. Propagate upstream an error code returned by platform_get_irq() and remove the bogus "platform" from the error message, while at it... Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") Signed-off-by: Sergei Shtylyov Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-sh-msiof.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 03b566848da63..b4f136d04a2b1 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1198,8 +1198,8 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) i = platform_get_irq(pdev, 0); if (i < 0) { - dev_err(&pdev->dev, "cannot get platform IRQ\n"); - ret = -ENOENT; + dev_err(&pdev->dev, "cannot get IRQ\n"); + ret = i; goto err1; } -- 2.20.1