diff --git a/[refs] b/[refs]
index 58455492a643..07d341e3d24f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18e16f9c954c6a931ee97584014c826255e0bdaa
+refs/heads/master: d343d7f9792ac1790757cb35a419b8b0b5210917
diff --git a/trunk/drivers/media/video/ivtv/ivtvfb.c b/trunk/drivers/media/video/ivtv/ivtvfb.c
index 0abca6bec7d4..4a7512d90bc9 100644
--- a/trunk/drivers/media/video/ivtv/ivtvfb.c
+++ b/trunk/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;
 		}