From: Hans Verkuil Date: Sun, 14 Oct 2007 14:17:14 +0000 (-0300) Subject: V4L/DVB (6343): ivtvfb: check return value of unregister_framebuffer X-Git-Tag: v2.6.24-rc1~66^2~14 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d343d7f9792ac1790757cb35a419b8b0b5210917;p=linux-2.6-omap-h63xx.git V4L/DVB (6343): ivtvfb: check return value of unregister_framebuffer Prevent unloading the framebuffer if it is still in use. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index 0abca6bec7d..4a7512d90bc 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c @@ -1169,9 +1169,12 @@ static void ivtvfb_cleanup(void) for (i = 0; i < ivtv_cards_active; i++) { itv = ivtv_cards[i]; if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) && itv->osd_info) { + if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) { + IVTVFB_WARN("Framebuffer %d is in use, cannot unload\n", i); + return; + } IVTVFB_DEBUG_INFO("Unregister framebuffer %d\n", i); ivtvfb_blank(FB_BLANK_POWERDOWN, &itv->osd_info->ivtvfb_info); - unregister_framebuffer(&itv->osd_info->ivtvfb_info); ivtvfb_release_buffers(itv); itv->osd_video_pbase = 0; }