Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756293AbcJTAdk (ORCPT ); Wed, 19 Oct 2016 20:33:40 -0400 Received: from mail.kmu-office.ch ([178.209.48.109]:45281 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753061AbcJTAcr (ORCPT ); Wed, 19 Oct 2016 20:32:47 -0400 From: Stefan Agner To: daniel.vetter@ffwll.ch, meng.yi@nxp.com, dri-devel@lists.freedesktop.org Cc: alison.wang@freescale.com, jianwei.wang.chn@gmail.com, linux-kernel@vger.kernel.org, Stefan Agner Subject: [PATCH 1/3] drm/fb_cma_helper: do not free fbdev if there is none Date: Wed, 19 Oct 2016 17:32:19 -0700 Message-Id: <20161020003221.2941-2-stefan@agner.ch> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161020003221.2941-1-stefan@agner.ch> References: <20161020003221.2941-1-stefan@agner.ch> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 891 Lines: 24 If fbdev emulation is not in use (or not built-in), fb_helper.fbdev is NULL. Don't call calling drm_fbdev_cma_defio_fini in this case. Signed-off-by: Stefan Agner --- drivers/gpu/drm/drm_fb_cma_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index 1fd6eac..12d654d 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -557,7 +557,8 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_init); void drm_fbdev_cma_fini(struct drm_fbdev_cma *fbdev_cma) { drm_fb_helper_unregister_fbi(&fbdev_cma->fb_helper); - drm_fbdev_cma_defio_fini(fbdev_cma->fb_helper.fbdev); + if (fbdev_cma->fb_helper.fbdev) + drm_fbdev_cma_defio_fini(fbdev_cma->fb_helper.fbdev); drm_fb_helper_release_fbi(&fbdev_cma->fb_helper); if (fbdev_cma->fb) { -- 2.10.0