V4L/DVB (6115): ivtv/ivtv-fb: improve locking to avoid initialization problems

ivtv/ivtv-fb: improve locking to prevent ivtv/ivtv-fb initialization problems

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/media/video/ivtv/ivtv-fb.c b/drivers/media/video/ivtv/ivtv-fb.c
index e80564aed632..ffe6478682ae 100644
--- a/drivers/media/video/ivtv/ivtv-fb.c
+++ b/drivers/media/video/ivtv/ivtv-fb.c
@@ -1011,10 +1011,13 @@ static int ivtvfb_init_io(struct ivtv *itv)
 {
         struct osd_info *oi = itv->osd_info;
 
+        mutex_lock(&itv->serialize_lock);
         if (ivtv_init_on_first_open(itv)) {
+                mutex_unlock(&itv->serialize_lock);
                 IVTV_FB_ERR("Failed to initialize ivtv\n");
                 return -ENXIO;
         }
+        mutex_unlock(&itv->serialize_lock);
 
         ivtv_fb_get_framebuffer(itv, &oi->video_rbase, &oi->video_buffer_size);