From patchwork Tue Mar 8 06:49:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12773124 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 274CEC433EF for ; Tue, 8 Mar 2022 06:51:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc: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=tudCqh+QEO8w+9AocyYWErlzp3p+NbVeDZCF0g7EgZ0=; b=RnFuw8f8VlrPnH kaU5XznmTD6RWOp21e2qT/ux3cOuYGqS6UGq6rtnHKxGuY2S9J5AyK7b7S4Zftg/PQvvFuHsClpV+ QIrtt+xG4+/hLFkFQ0DncnOzHMsWUi0MHe/d/v5piAdXbzfnlWU6q5y5NCe0ppx+aUKCJpG6nlxu9 7FhEhwkF0Wa5Rwp1tsv2vvbN5AGBzc+zZkkFkcz9g9fXWTdtdc5y+8EMSJ/LzurDz8ecu4L/iUO0+ uRZvY0lwmhVRlJSLUqYUhkmePLIP+4SidNJb3EAGDSUZSnfDF1bAtHSIRxk3+jiPv5Gyu+1QjNXV9 WSa8Ory8IKuH63CHv0ew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nRTfW-002xZe-P8; Tue, 08 Mar 2022 06:50:02 +0000 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nRTfS-002xY8-MI for linux-arm-kernel@lists.infradead.org; Tue, 08 Mar 2022 06:49:59 +0000 Received: by mail-pj1-x102d.google.com with SMTP id bx5so16272739pjb.3 for ; Mon, 07 Mar 2022 22:49:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=stuWRE0fpV+3ocvFzIL+5jqWnax7n9BxoKZw/kt5w9s=; b=oxGaiEBcfwWHbVvp3IFQUeN7hyLS6AXjzlWejiDsHxawo0sP2VMBimKyr998lAGaVF GoBjrG5hySVY79T043Vc5joODZYEPkRd8d/WOtNM4sFQkDDmQCPgzbNIZM9u2SfWxLCr 0jp8nyBJ/egmQYF5RFoY0ck/fHosVg2FNQ6Jq28tQiIlJNNLFKmz4TXd5ToQE2Iu7YUb MAWw2ASjf3LY15lsQjmiSXO8rSR9yxfDuEb4TusIZAO/KyfFhKksibgsvconX32s56dj Gb44QGPB3ryFKftZubJqss1awGVMnnZFhAllSPeDwZzmEMTFqVe5WFZua0vUC8k8WSgG //8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=stuWRE0fpV+3ocvFzIL+5jqWnax7n9BxoKZw/kt5w9s=; b=1LgSx7DjPSe1S1IYzx/ue14Bv9m7lzsykI/vln4QKTit7Qx2nmq2OGg8oq0pIksQd2 aeO3owqvIucbZghQ9p4KkJggXUW7RLHkbXHwyevZ5QcgLV7Ylo2v7lphYvKemCd5icI2 UrHos4j60tjOa6JasWlw3HgS3zWstA8daCQ3pXqbQgy3z6956UXehplpN8naVS7g0DDG W3ECGCNx/Nprn185MloGypMa2xVX8Gry9LqNPqh3UCWUrjR91UZ/KHkQ6SMgLMxa8v/k hFkgEVxl6Qywp7PiFpqFi8BQHrsFVTtll3UCqNOO+0NjHARj9NYb2x8RC3hTFCPkz457 nLHg== X-Gm-Message-State: AOAM533xZIiEmKOXyPqoi2bMerCcFAnDmAeAaZGUWoBUGMNSF4FpPLri vLJ3zP2KZGeZtssLYI1WEa0= X-Google-Smtp-Source: ABdhPJwKmhYpZGUB3BAzsBmM83UVCHwA6d9ECoD/UUlYxDz3NYGSljEOnbghv4mMyZkTHx+wvv8S1g== X-Received: by 2002:a17:903:40c3:b0:151:c8a2:1c46 with SMTP id t3-20020a17090340c300b00151c8a21c46mr16203301pld.141.1646722197624; Mon, 07 Mar 2022 22:49:57 -0800 (PST) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id 23-20020a17090a0d5700b001bc3c650e01sm2342391pju.1.2022.03.07.22.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 22:49:57 -0800 (PST) From: Miaoqian Lin To: Vinod Koul , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Zidan Wang , dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH] dmaengine: imx-sdma: Fix error checking in sdma_event_remap Date: Tue, 8 Mar 2022 06:49:51 +0000 Message-Id: <20220308064952.15743-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220307_224958_783807_85943149 X-CRM114-Status: GOOD ( 12.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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 75ec0754d4ad..0be1171610af 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1869,7 +1869,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); @@ -1917,7 +1917,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;