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=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 877EEC433DF for ; Fri, 19 Jun 2020 15:27:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58844218AC for ; Fri, 19 Jun 2020 15:27:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592580445; bh=3BabQJM6BN1aJZwxaMkpymzATSEqgRe2H4GvW+yQVss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eL2ohc+snaMPhLD2mxCX7FJh/hNmXx3B4dSlTGvoOFXIlJMchZaU6Kg3j40zZVlIu TxlGvVhKN57O42ZkoqQCZZDBUmBtxDrcwg0QrWM77aZsq9jaenW9BFqRaN5Ab/xifb BLADosLN/f914bQSMM/gikzSeCgbcdR012hFczjU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393540AbgFSP1Y (ORCPT ); Fri, 19 Jun 2020 11:27:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:57654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404174AbgFSPZz (ORCPT ); Fri, 19 Jun 2020 11:25:55 -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 00A1E20B80; Fri, 19 Jun 2020 15:25:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592580354; bh=3BabQJM6BN1aJZwxaMkpymzATSEqgRe2H4GvW+yQVss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C/pF7HtAvf6nzhPNO6K/oYxi2ualZ5K9CQb/LB1Ixe/D06Vl8mgL8bCNElgkUEFDK idMPyLWMRWgdkGu+Pcn5PfxNZFtGZpmXYF61I1dX+9rvD36IBGzh0unp9/kms0xhCN WL0h9EY+2hsYg/ycELgbgXlYQ2a4HW3MC938EsHk= 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.7 177/376] drm/mcde: dsi: Fix return value check in mcde_dsi_bind() Date: Fri, 19 Jun 2020 16:31:35 +0200 Message-Id: <20200619141718.732114117@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141710.350494719@linuxfoundation.org> References: <20200619141710.350494719@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 7af5ebb0c436..e705afc08c4e 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -1073,10 +1073,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