From patchwork Tue Oct 27 13:53:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 289977 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.8 required=3.0 tests=BAYES_00,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=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 439CFC55179 for ; Tue, 27 Oct 2020 14:41:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E1FF321D7B for ; Tue, 27 Oct 2020 14:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809661; bh=lIXOfBfINf2wzSPboSFqNfQuP+/BvFDMm1SrkXYs+c0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ky724w+Wn9ADTtjcNjpL1U5HSG3A6IKwE9DXd33ElwvRCgM9h/f9m3jKOkGMlSxMb pjJ23XbUCshSQw0Jr3G5IGOS+PSSXcb9BK4HpgyLV81kBQnHFpj7x/Nze0FSv8Ivxb irQs+Z4E160Exag0W2/RsM3rMgVZ94VAqL1w7fQE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761407AbgJ0Okw (ORCPT ); Tue, 27 Oct 2020 10:40:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:39266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761566AbgJ0OkA (ORCPT ); Tue, 27 Oct 2020 10:40:00 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 86E90206B2; Tue, 27 Oct 2020 14:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809600; bh=lIXOfBfINf2wzSPboSFqNfQuP+/BvFDMm1SrkXYs+c0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hrz6PbUvHzlL26dJ2RkLq3sRap9UXmLi7qZt8NU43EBknYJBx194+eTto7LZElcrX 5aiwP8DDZAAUHyemijhXyX/LDrrgzoHSn33n8vA8gKTN1xnZPbIiUl6yM+25Kp7kfD bEHj+Jcm9AyNcJabw9OF2m4/BWbUratMY5ghx9gM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jing Xiangfeng , Boris Brezillon , Sasha Levin Subject: [PATCH 5.4 246/408] i3c: master: Fix error return in cdns_i3c_master_probe() Date: Tue, 27 Oct 2020 14:53:04 +0100 Message-Id: <20201027135506.466308641@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jing Xiangfeng [ Upstream commit abea14bfdebbe9bd02f2ad24a1f3a878ed21c8f0 ] Fix to return negative error code -ENOMEM from the error handling case instead of 0. Fixes: 603f2bee2c54 ("i3c: master: Add driver for Cadence IP") Signed-off-by: Jing Xiangfeng Signed-off-by: Boris Brezillon Link: https://lore.kernel.org/linux-i3c/20200911033350.23904-1-jingxiangfeng@huawei.com Signed-off-by: Sasha Levin --- drivers/i3c/master/i3c-master-cdns.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c index 10db0bf0655a9..6d5719cea9f53 100644 --- a/drivers/i3c/master/i3c-master-cdns.c +++ b/drivers/i3c/master/i3c-master-cdns.c @@ -1593,8 +1593,10 @@ static int cdns_i3c_master_probe(struct platform_device *pdev) master->ibi.slots = devm_kcalloc(&pdev->dev, master->ibi.num_slots, sizeof(*master->ibi.slots), GFP_KERNEL); - if (!master->ibi.slots) + if (!master->ibi.slots) { + ret = -ENOMEM; goto err_disable_sysclk; + } writel(IBIR_THR(1), master->regs + CMD_IBI_THR_CTRL); writel(MST_INT_IBIR_THR, master->regs + MST_IER);