From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=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=unavailable 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 E14AEC433E0 for ; Fri, 19 Jun 2020 15:09:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B12CC21D7E for ; Fri, 19 Jun 2020 15:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579379; bh=zoPUu6VReNltlF5ukysiF0rm/a/PTQJdp5lkU8Ej1aE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tp5gCWmRVEL3aMTjhhLs3dVJGS4UT0LASnR7ARMQVfcZYvnlc8i/PMNXsepiXGuNm zzB/gO/ogoEJjbqJaJs51fLqmOCS2Yt/EiS7B6rzTKtC8adMI5aCNcLn+M4nA2f6xO LFvfP3IHjT6atSLKDRsBzIy7JHVxFwInozDl8c10= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391940AbgFSPJi (ORCPT ); Fri, 19 Jun 2020 11:09:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:39286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391912AbgFSPJc (ORCPT ); Fri, 19 Jun 2020 11:09:32 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 7AC8321D7E; Fri, 19 Jun 2020 15:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579372; bh=zoPUu6VReNltlF5ukysiF0rm/a/PTQJdp5lkU8Ej1aE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lw9nGCaS56eQUEjT/ypcvs88TYNzOqBil38ADtP/Gnb1EIx7AQxzg36/jFI9la1pl JtyvLOwEL9w1DJfBA/tMfs0P1U/xwMXdTuaDejX+EES0ci/iOfonxzJb2Bc0b5SH6E mR1nAAYGZRpjyky1dkHiVWyylRtqDm6i7EjnshWk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , Linus Walleij , Sasha Levin Subject: [PATCH 5.4 110/261] drm/mcde: dsi: Fix return value check in mcde_dsi_bind() Date: Fri, 19 Jun 2020 16:32:01 +0200 Message-Id: <20200619141655.141672110@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141649.878808811@linuxfoundation.org> References: <20200619141649.878808811@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun [ Upstream commit 761e9f4f80a21a4b845097027030bef863001636 ] The of_drm_find_bridge() function returns NULL on error, it doesn't return error pointers so this check doesn't work. Fixes: 5fc537bfd000 ("drm/mcde: Add new driver for ST-Ericsson MCDE") Signed-off-by: Wei Yongjun Signed-off-by: Linus Walleij Link: https://patchwork.freedesktop.org/patch/msgid/20200430073145.52321-1-weiyongjun1@huawei.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/mcde/mcde_dsi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 35bb825d1918..8c8c92fc82e9 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -940,10 +940,9 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, panel = NULL; bridge = of_drm_find_bridge(child); - if (IS_ERR(bridge)) { - dev_err(dev, "failed to find bridge (%ld)\n", - PTR_ERR(bridge)); - return PTR_ERR(bridge); + if (!bridge) { + dev_err(dev, "failed to find bridge\n"); + return -EINVAL; } } } -- 2.25.1