From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752616AbdKDVYx (ORCPT ); Sat, 4 Nov 2017 17:24:53 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:50447 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751475AbdKDVY1 (ORCPT ); Sat, 4 Nov 2017 17:24:27 -0400 X-Google-Smtp-Source: ABhQp+T9OUcWoxMoosRHmOwGWExH4nYg1bpLtICJK+pKM3cHFghAe5A58eFjqIUhWw9WuZd3DLJ6hw== From: Sudip Mukherjee To: Bartlomiej Zolnierkiewicz Cc: linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org, Sudip Mukherjee Subject: [PATCH 2/3] sm501fb: unregister framebuffer only if registered Date: Sat, 4 Nov 2017 21:24:20 +0000 Message-Id: <1509830661-7384-2-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1509830661-7384-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1509830661-7384-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are cases when panel and crt both are not defined and only one of them is defined and initialized. In such cases, while removing the device, unregister the framebuffer only if it was registered. Signed-off-by: Sudip Mukherjee --- drivers/video/fbdev/sm501fb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/sm501fb.c b/drivers/video/fbdev/sm501fb.c index 381475f..577a483 100644 --- a/drivers/video/fbdev/sm501fb.c +++ b/drivers/video/fbdev/sm501fb.c @@ -2079,8 +2079,10 @@ static int sm501fb_remove(struct platform_device *pdev) sm501_free_init_fb(info, HEAD_CRT); sm501_free_init_fb(info, HEAD_PANEL); - unregister_framebuffer(fbinfo_crt); - unregister_framebuffer(fbinfo_pnl); + if (fbinfo_crt) + unregister_framebuffer(fbinfo_crt); + if (fbinfo_pnl) + unregister_framebuffer(fbinfo_pnl); sm501fb_stop(info); kfree(info); -- 2.1.4