From patchwork Thu Nov 5 15:30:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 11884643 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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 B04DDC55178 for ; Thu, 5 Nov 2020 15:32:01 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 244D020735 for ; Thu, 5 Nov 2020 15:32:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="u3WPvYza"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="lX0KHUps" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 244D020735 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=XKcmmmSjEmv6VRVjrdXQvtUayHiCs+OcPs6eJ7B3roI=; b=u3WPvYza+BuN8xU5bRGrQzdiXb +pR61SxH4AO26asD2niN9075y0NUrmbx+gZscVOHJbawLd3ab3mZJcSlaTCZND0xkCHGrZ23bawiI cRjRpZ2KVjGthiB8viiKljtnWjgWR6Kt+HgiwJ/i3Jkn9HGHaki5o/bEY0YxPIojNG18OqS5gn9Gl L9G3pHQpudZXXav6+GAiHA4a4OGL3FSalBpr8hX08lMqMNcuVDLrW/xDfkWwAcShH6JU5qBTp6sxB snNJFRxrj+ERuN8JXk+vpsZKRHbpd5W5MMpXKNxq78MP9Z3Irb6in/R+R7Cxk5a38OanOIfjbpK3r EeJCtNbQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kahEd-00068Y-L5; Thu, 05 Nov 2020 15:31:35 +0000 Received: from mail-eopbgr40049.outbound.protection.outlook.com ([40.107.4.49] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kahEZ-00066l-H6 for linux-arm-kernel@lists.infradead.org; Thu, 05 Nov 2020 15:31:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HinGuRlb6yHRqLiO4FdA6RFlDya5naNS11xa1E3Ghoh3xggnu/iFl3BQdsxkp1SMMZu9IyNmVlRiwW2yDJcYj4O8xOUjw8ODzhPSAzi8uej5vqKHKBu7TnVpyR9g425PMIoto00NYUlF3h6NHWwgNj0fq998+MUUZjNsGlOTtWnYK2CvHsgckaAP2hrQOy9wvQ8QixGZjbUpDnHgq0wL0mnhAJSgYyhwUdolPzHcI1jFB8jpHz4+AVuMCniR6rMdGcri/gOrueQNxAVoY+dtoth3Xw5EeAsku4lxlHE+0icw3le4WCyPp79fTGAPYH4emf8MxIUIm97fxniOlmKtgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a+wI46yJ5G1UPgxB/dV/8b+y48yzFNxOyR/whS0J5k0=; b=mB/AmWqScsZCn4P6IhChxU/MNMOaXX1FuovI4p7TdAsGGw5fE2fJDe/uCIkiEcXwREYuNQoX3Q7De3vPS2FmsEOviWUnSVhjHSoFrq1hp8jqXMUiMQCosr9WOI8/qWkkALoFqfgKI87iU8lXmStOTsJUj457ryx4aeIb5MbAvUPc2cU6MIUQDPnB2H4KK2UQ9Gh5p3sqcVgZQF3rNG+qqQAQ11BvV9l9XVmlpahLY2b8R/qWVYS4PYsaQYCYBeMMZSCtaZNXzHPHkQPXY96SrGK4t5lN/0dnY8L/2p2V9BAfpoANH+TRx6D8iL+BnIIJDJzrUb5BuwgnHphW8OLHDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a+wI46yJ5G1UPgxB/dV/8b+y48yzFNxOyR/whS0J5k0=; b=lX0KHUpsdf9p9UTPvEHOIKYwzfZKFcaQDIJqfdEtuzUIF4eXr19Q2XZzMbMkhizr/4jGIS3x4PXZ2pYsSwVn5JSv56evi2N4IP5m4iWLOhB1tvTv4m6WKdvkJxf4q6VGMXpnVtOlRIT9GPjgjV0n7aToK162Y8Nngsgkh1yYZ9U= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=nxp.com; Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) by VI1PR04MB4895.eurprd04.prod.outlook.com (2603:10a6:803:56::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Thu, 5 Nov 2020 15:31:26 +0000 Received: from VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::f557:4dcb:4d4d:57f3]) by VI1PR0402MB3405.eurprd04.prod.outlook.com ([fe80::f557:4dcb:4d4d:57f3%2]) with mapi id 15.20.3499.032; Thu, 5 Nov 2020 15:31:26 +0000 From: Laurentiu Tudor To: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] bus: fsl-mc: add back accidentally dropped error check Date: Thu, 5 Nov 2020 17:30:49 +0200 Message-Id: <20201105153050.19662-1-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [83.217.231.2] X-ClientProxiedBy: AM3PR05CA0156.eurprd05.prod.outlook.com (2603:10a6:207:3::34) To VI1PR0402MB3405.eurprd04.prod.outlook.com (2603:10a6:803:3::26) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from fsr-ub1864-101.ea.freescale.net (83.217.231.2) by AM3PR05CA0156.eurprd05.prod.outlook.com (2603:10a6:207:3::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Thu, 5 Nov 2020 15:31:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f23371bf-5e05-4897-ec2a-08d8819fd7c6 X-MS-TrafficTypeDiagnostic: VI1PR04MB4895: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wkyksh+hxe50C7RSx+BJKDjDcSKpW1OpqXYrMjPSM9fCXfcS85qnuNgtECjA1hTwnQIAL0DetcHxcOLruviw7MZyUEeZfCfsNYn9yAytpm1pkMlWcMd2v6lbakrCG0W0sUmlpbGPyPoAVNvFRLg2BI8tUEcYsCMXmA1unDDIOQuDYotY44C3hOI74J+GoHnR+r8H0fy9Vmq0TVpjCWGqkOZF9eMQbt644L69/Kuss51qbmEpdobNYPRjb2xeBc11CHy4S4r4nS9xBq89a8fQWD4DhSm+Dpmfqx0C0VZcWwPIhiEQrBJ5SIVSugMbzAm1WlVlXerbXvkKHsCT/B9Ayg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR0402MB3405.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(396003)(376002)(366004)(136003)(346002)(8936002)(956004)(52116002)(66946007)(36756003)(66556008)(66476007)(2616005)(26005)(316002)(5660300002)(6506007)(1076003)(6666004)(4744005)(4326008)(86362001)(8676002)(2906002)(186003)(44832011)(16526019)(83380400001)(6486002)(478600001)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: /2mSHQDe4LRueascyAZjoZbJHiGhaUESPfVy7YWTwbksuXRUlxWUPkk+hJzxXLHh5XaUYR/gA/LUqR1p/RE0CgAcK35c4TnJNeliWiNKWMr2pHoBHq7Cuc1aqOE61DX55w3WstzK/YY+Sh0qD8EHL45+WYRkFPtZOkmS4CZ+5wq/FvUtdTQUAmbfYM95Q8BUfcRnN6djg4qT3VJQ4WEjdtnpFCSeY5rhFLjp15d4YoLB8u8p9nK1WG4HjO2mtHRDe4D4gPS9lcQnKPOJ6audI65Ota4M5DmJbr6SVCjHtlpa4RF1hj6UpCgQeRfvmEuVAYcGOW/vRHGi+raPK2SOtZ5JAWSfnvfgFB7uB5vZvdVNYEaP7JSM7dbY/wmXK8a4DORXciFM+5EFBuoO+H5xrpGow9Lf1mQ1KQ44s68/mNC6j1z8iq91nuKdN6L8UldHWtqTbc89khcsMzU/P6t4w2q3986XDbZQJc8Xy5Roil5ChsJ98fsnt5pgnJ+pMBjEa1ih2lUqhTcOulQtdis//d5E6ru0wDZDMkNyiwBG0Gi03QBrKYQCadWXQSDO7TFqXqgMJCISfCHR5dZTfoKM8GHsJPSJ9/H98m+anPPFGrFG4W9IcXigCiUMArrztFu+CARImYu0ls9d2iAV452KXw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f23371bf-5e05-4897-ec2a-08d8819fd7c6 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2020 15:31:25.9598 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7X3GaaxzJVf0inKGEbj4qxxXmexUD+kcpNCEFppNo90PtfOO4WW4y5Q/k1KWPQirjG/sa5mI/qeqihzSrpxBTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4895 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201105_103131_800562_6611223D X-CRM114-Status: GOOD ( 11.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ioana.ciornei@nxp.com, Laurentiu Tudor , diana.craciun@oss.nxp.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org A previous patch accidentally dropped an error check, so add it back. Fixes: aef85b56c3c1 ("bus: fsl-mc: MC control registers are not always available") Signed-off-by: Laurentiu Tudor --- drivers/bus/fsl-mc/fsl-mc-bus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c index 76a6ee505d33..806766b1b45f 100644 --- a/drivers/bus/fsl-mc/fsl-mc-bus.c +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c @@ -967,8 +967,11 @@ static int fsl_mc_bus_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mc); plat_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (plat_res) + if (plat_res) { mc->fsl_mc_regs = devm_ioremap_resource(&pdev->dev, plat_res); + if (IS_ERR(mc->fsl_mc_regs)) + return PTR_ERR(mc->fsl_mc_regs); + } if (mc->fsl_mc_regs && IS_ENABLED(CONFIG_ACPI) && !dev_of_node(&pdev->dev)) {