V4L/DVB (5924): ivtv-fb: initializing the fb should trigger ivtv firmware load

ivtv-fb: initializing the framebuffer should trigger ivtv firmware load

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

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 498860841644..fedddecf661e 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -846,16 +846,12 @@ int ivtv_v4l2_open(struct inode *inode, struct file *filp)
         if (itv == NULL) {
                 /* Couldn't find a device registered
                    on that minor, shouldn't happen! */
-                printk(KERN_WARNING "ivtv:  No ivtv device found on minor %d\n", minor);
+                IVTV_WARN("No ivtv device found on minor %d\n", minor);
                 return -ENXIO;
         }
 
-        if (!test_and_set_bit(IVTV_F_I_INITED, &itv->i_flags))
-                if (ivtv_init_on_first_open(itv))
-                        set_bit(IVTV_F_I_FAILED, &itv->i_flags);
-
-        if (test_bit(IVTV_F_I_FAILED, &itv->i_flags)) {
-                printk(KERN_WARNING "ivtv:  failed to initialize on minor %d\n", minor);
+        if (ivtv_init_on_first_open(itv)) {
+                IVTV_ERR("Failed to initialize on minor %d\n", minor);
                 return -ENXIO;
         }