Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp3950138ioa; Tue, 26 Apr 2022 13:11:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnDLptHkLvRmRK1oIyNmSmIWM1tpRpECzvMNlombQwwPHNjL9vq7qUlUi0j71+/N6WGZjM X-Received: by 2002:a17:907:1b0a:b0:6f0:e3d:1f5d with SMTP id mp10-20020a1709071b0a00b006f00e3d1f5dmr22629378ejc.418.1651003898119; Tue, 26 Apr 2022 13:11:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651003898; cv=none; d=google.com; s=arc-20160816; b=RYicr9Hcwiec2M6jfN0j+pCjbadqVligG/Mp5KsJnGhnAANVOU3xpzCA1BOsVRhkzQ K9ZJFUbHSAhYqlpem/ctpPCv2wNadecMaaoAgXT0LTDqpr2nsJtTW5x2ypWRCDy9nLDq kJJNdJCAHLr3Zij8s3xQpkjlvKsr5py3P7dx06WbEIkMYO8ZaFfvfGgzb/57QYD79VpK /WLX06zNv+Ie1bgKDh875N5cGgdhfY0LNKX8Ykd2/7npG28mr59H0cjPdWtRBwoKbKmJ 9CLWIYTgUpEWqppsuHLD0lsNxRPcdt5UxQ9mjr4MKAFmDrsSqPKH6kZ09tFsIxSSinyb pXwg== 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=NqU3Hm/CQNVW9mXFVhDs4t8vRP1dj4KIB8480/KN+28=; b=AEGga/tBPfffz9Xy4fBqyEKU47GIBUct0G1Haes6h2MgC9rVwpX6/x8hFjBbTgrVJ/ w9D+EJxN0aDROij7jyITyvKdKBuFSzLn7CD2EtIUocPj44+Hm+a/zIOReHZeUc4cVquy qgzXdutoqkTi0PBrgedDNETWC0ket1PTh9SqbAPDJ4+iuFyoEqVcpFA67juqSsABGML8 QU+BoL/J3BMtdeVCD3L/CMautPtEbdN6vqvb2ENVv7PJPaLgth9IhcKTabt6ug+df07v ZNOQf9ET4po2stC2pMLLuBYUjDOLh/Bx6id77AoWZF64VwD7FxRBaPoqYz8q512CGT90 /w1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uKRfmjNW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nb35-20020a1709071ca300b006f3a26633a0si4591027ejc.150.2022.04.26.13.11.14; Tue, 26 Apr 2022 13:11:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uKRfmjNW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S1345834AbiDZIyE (ORCPT + 99 others); Tue, 26 Apr 2022 04:54:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345830AbiDZIjg (ORCPT ); Tue, 26 Apr 2022 04:39:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91B04793A0; Tue, 26 Apr 2022 01:32:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2D78C617D2; Tue, 26 Apr 2022 08:32:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36871C385A0; Tue, 26 Apr 2022 08:32:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1650961920; bh=tRbye1fxfoP+AzMBZoQEW1nrxP5cNRSw6FqxdHBimmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uKRfmjNWLtkW+bIHG2DYId9WGSB7mtQ1MiiKFhixiZJAa42GEf43ZgFVGnJij+47I EeXd1nCEYuMA1eJfKteTn+W5H4xvRZzhQ9o2LL1hlk7SYSjWvXHh9Qmi9YrVcA1G+8 hjAFMYPQcKa+JkYU6q1AFUPzmBmRGj2tW7Pg/m9g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miaoqian Lin , Vinod Koul , Sasha Levin Subject: [PATCH 5.10 13/86] dmaengine: imx-sdma: Fix error checking in sdma_event_remap Date: Tue, 26 Apr 2022 10:20:41 +0200 Message-Id: <20220426081741.588957639@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220426081741.202366502@linuxfoundation.org> References: <20220426081741.202366502@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Miaoqian Lin [ Upstream commit 7104b9cb35a33ad803a1adbbfa50569b008faf15 ] of_parse_phandle() returns NULL on errors, rather than error pointers. Using NULL check on grp_np to fix this. Fixes: d078cd1b4185 ("dmaengine: imx-sdma: Add imx6sx platform support") Signed-off-by: Miaoqian Lin Link: https://lore.kernel.org/r/20220308064952.15743-1-linmq006@gmail.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/imx-sdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 306f93e4b26a..792c91cd1608 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1789,7 +1789,7 @@ static int sdma_event_remap(struct sdma_engine *sdma) u32 reg, val, shift, num_map, i; int ret = 0; - if (IS_ERR(np) || IS_ERR(gpr_np)) + if (IS_ERR(np) || !gpr_np) goto out; event_remap = of_find_property(np, propname, NULL); @@ -1837,7 +1837,7 @@ static int sdma_event_remap(struct sdma_engine *sdma) } out: - if (!IS_ERR(gpr_np)) + if (gpr_np) of_node_put(gpr_np); return ret; -- 2.35.1