Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp4410609ioa; Wed, 27 Apr 2022 03:18:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNNEQHWoQDstoo3gKcKgjc9g6woAYf/Q+n03JNyREzK2T/BkbBISHIebbQ+X//BTe2quW3 X-Received: by 2002:a17:902:70c8:b0:156:509b:68e3 with SMTP id l8-20020a17090270c800b00156509b68e3mr28126308plt.113.1651054715779; Wed, 27 Apr 2022 03:18:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651054715; cv=none; d=google.com; s=arc-20160816; b=l7lGgUWqf7fNz6GoWZc/p2eCohhuoJGCwOdj9BIhB3F3SEY9VawKFAOXqmXG/1TLAI ACJG0+qGUdKk/myKaHrngGNNuoxHcpQfDFwdoAG+U1eKdwC4BQK2Ix+w52Lgl1pDYlSQ NsVI9/myEu6QV77DRLtoHj3M3LuQ47aV8yBJ3/IJsXnmINTyw3DJifbUiaW9KGJuZX8G oTr1JAimO7FUP1UykdhS/rSf1dVuLnjk4thTb1JrAyMZUpBdDmxz4ZA7iY0Cy6PGs/wy cZOpDRbinnOQI00x3XiUKEIIHfzReZvA4XMZOh6pUxanxQpu07vjpPAymm3EDCq0mzh7 h2Aw== 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=cBbZ/cBzYLEwCd5rOpw7ngy9tX0gCW2AG30eIaSblbg=; b=0HswS0v5A61Q0KPvCTHQuS79BdnwR2n3dX90fitTsNH5dsJ+fkMF30/xmOwkzf23qb 6qVxus1Z/fMAyyM+I2qTkctFAKNkANrUGe5A/U37ueBv32YxwHZAhY5QYebo9ibOeeSt EWRzT3JKKC8B5PYa+tWJVhkR7mYffOcLCd6ZnqEQmmMkbdFMxC4pDJNGm9N26P/k0rug jw0+yJexGdr5sac9iSSTwCbwV6EU50fg3MaYnvvi3N/ceaC5Ib0g22e1zpg+td0kdI1n AsUg1WjD8L1gk01e+5ef4BxV4+xqFeIwrK4jqGKMmGBZg9alOl3laMau3cWBzaBmgXcB HCNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rGnsT03r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1: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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id j15-20020a170903028f00b0015ad8a424e3si1165465plr.428.2022.04.27.03.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 03:18:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rGnsT03r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1: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: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BC988FD17; Wed, 27 Apr 2022 02:38:48 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345682AbiDZInx (ORCPT + 99 others); Tue, 26 Apr 2022 04:43:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344935AbiDZIfg (ORCPT ); Tue, 26 Apr 2022 04:35:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D227B83B23; Tue, 26 Apr 2022 01:28:53 -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 0C4626179E; Tue, 26 Apr 2022 08:28:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19647C385A4; Tue, 26 Apr 2022 08:28:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1650961732; bh=Om3yeQJ1NuOJQqrgZNXqUA79TbGB1dOPIWhBpYZttjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rGnsT03rfmUf5qsF2pUcyEnh8k2dbBpeOCKVLdkX1q7N2RlJIX+Lkux41i/eMmkgH dTwbbqpJ/KZnj+7PUT5TijotwsqFJSlqlGHb1XPFJNmb8GGx+hbZNtH26boBa6SWa9 Jd5rHHm7rMx8IgBaxp8tCKZ/195Tr6CVC1led8sU= 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.4 12/62] dmaengine: imx-sdma: Fix error checking in sdma_event_remap Date: Tue, 26 Apr 2022 10:20:52 +0200 Message-Id: <20220426081737.577549166@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220426081737.209637816@linuxfoundation.org> References: <20220426081737.209637816@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=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE autolearn=unavailable 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 cc70da05db4b..801bef83df2a 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1784,7 +1784,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); @@ -1832,7 +1832,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