From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S945408AbcJaSAP (ORCPT ); Mon, 31 Oct 2016 14:00:15 -0400 Received: from smtp06.smtpout.orange.fr ([80.12.242.128]:47429 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S945331AbcJaSAN (ORCPT ); Mon, 31 Oct 2016 14:00:13 -0400 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Mon, 31 Oct 2016 19:00:10 +0100 X-ME-IP: 92.140.167.9 From: Christophe JAILLET To: p.zabel@pengutronix.de, airlied@linux.ie Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] drm/imx: Fix error handling Date: Mon, 31 Oct 2016 18:59:17 +0100 Message-Id: <20161031175917.4053-1-christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.9.3 X-Antivirus: avast! (VPS 161031-0, 31/10/2016), Outbound message X-Antivirus-Status: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 'drm_dev_alloc()' returns an error pointer in case of error, not NULL So test it with IS_ERR. This behavior has been introduced recently in 0f2886057be3. For some reason, this file has not been updated. Fixes: 0f2886057be3 ("drm: Don't swallow error codes in drm_dev_alloc()") Signed-off-by: Christophe JAILLET --- drivers/gpu/drm/imx/imx-drm-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 98df09c2b388..3acc976cc04e 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -357,8 +357,8 @@ static int imx_drm_bind(struct device *dev) int ret; drm = drm_dev_alloc(&imx_drm_driver, dev); - if (!drm) - return -ENOMEM; + if (IS_ERR(drm)) + return PTR_ERR(drm); imxdrm = devm_kzalloc(dev, sizeof(*imxdrm), GFP_KERNEL); if (!imxdrm) { -- 2.9.3