From patchwork Wed Jan 20 09:16:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 12031749 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=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 5E76AC433DB for ; Wed, 20 Jan 2021 09:20:09 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0491B23139 for ; Wed, 20 Jan 2021 09:20:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0491B23139 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=163.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject: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=gYhndG+SW91ow8dxyC32/MCeBALkn0uUEskIYEBfD80=; b=HW3HF8CVq9fOwJHlB0F90sjAsP bcR7L+duY98XvBD2myLaO7e7GvHu0pXix4to9nOcgCM2bK4nYjKYangj155WMllhSS7rnlcZA5l5J /LEeAyY7mTtW846F4+oehFxW3qF7vAyWUvIa2bwvGHzNQNukxZ/5+Y2UWLzwcLf2cbBY/km6CzKXL i6If8pC3KDznRaCOgH6K7xUR2d7BG3YlMuX5RJzYt0kBoH2oQ5SNiT9A0Vp55XJ96ZP3ss702HHzl CIOQ8lgwv6Qd/LsjrhzgeGlCWbe9xDU2VeNKHivFqpHPOweGv3DpTFR6qMsq+1O20eAfjqDU6Ufq9 QrnYhjWw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l29dB-0007Zg-Qt; Wed, 20 Jan 2021 09:18:25 +0000 Received: from m12-12.163.com ([220.181.12.12]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l29d6-0007Yr-2c for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 09:18:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Yp61YTYqIPSgUyAXLx mxc3um8VNJsJyV0cVgGrHmGug=; b=TTMhZ6cI2mgr2FLdC4e99khPVydugSXX2/ Vo8VoMqjshjnmjj69OF8q9orVA9Uax+IBeDFebWriYqqey0ZS44igfkqZ76pbzp9 L1VnKzVn00mxNCxstePH4p+/QyHtfz++Si+YpnRMVVgREtqBLOoxmB5eJ7ny+Yrz BBEkpnAo8= Received: from localhost.localdomain (unknown [119.3.119.20]) by smtp8 (Coremail) with SMTP id DMCowADHt_bd9Adg5f7IMw--.65179S4; Wed, 20 Jan 2021 17:16:19 +0800 (CST) From: Pan Bian To: Philipp Zabel , David Airlie , Daniel Vetter , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Subject: [PATCH] drm/imx: fix memory leak when fails to init Date: Wed, 20 Jan 2021 01:16:08 -0800 Message-Id: <20210120091608.12430-1-bianpan2016@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: DMCowADHt_bd9Adg5f7IMw--.65179S4 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr1xJr47KFW7ur4Duw48Zwb_yoW3Xrg_G3 WUXryxWrsa9a4qvw13ZF4Yyryayrn7ZF4Fyr1xKaykJ342v3ZrXFyjgr9rZ348Xa1xCFyk WFs5XF17Zr17CjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUU9Xo7UUUUU== X-Originating-IP: [119.3.119.20] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/1tbiDgMgclXly8C2BAAAsW X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_041823_365234_5D39D56E X-CRM114-Status: GOOD ( 13.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pan Bian , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Put DRM device on initialization failure path rather than directly return error code. Fixes: a67d5088ceb8 ("drm/imx: drop explicit drm_mode_config_cleanup") Signed-off-by: Pan Bian --- drivers/gpu/drm/imx/imx-drm-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index d1a9841adeed..e6a88c8cbd69 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -215,7 +215,7 @@ static int imx_drm_bind(struct device *dev) ret = drmm_mode_config_init(drm); if (ret) - return ret; + goto err_kms; ret = drm_vblank_init(drm, MAX_CRTC); if (ret)