V4L/DVB (7242): ivtv: fix for yuv filter table check

As the result of a previous change that delayed the loading of the firmware,
the driver can sometimes report a bogus error regarding the yuv output filter
table not being found in the firmware. This patch moves the filter table
check to ensure it's only done after the firmware has been loaded.

Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index d42f120354e5..9d36ab999141 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -54,7 +54,6 @@
 #include "ivtv-vbi.h"
 #include "ivtv-routing.h"
 #include "ivtv-gpio.h"
-#include "ivtv-yuv.h"
 
 #include <media/tveeprom.h>
 #include <media/saa7115.h>
@@ -1053,9 +1052,6 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
                 goto free_io;
         }
 
-        /* Check yuv output filter table */
-        if (itv->has_cx23415) ivtv_yuv_filter_check(itv);
-
         ivtv_gpio_init(itv);
 
         /* active i2c  */
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c
index 425eb1063904..6dba55b7e25a 100644
--- a/drivers/media/video/ivtv/ivtv-firmware.c
+++ b/drivers/media/video/ivtv/ivtv-firmware.c
@@ -22,6 +22,7 @@
 #include "ivtv-driver.h"
 #include "ivtv-mailbox.h"
 #include "ivtv-firmware.h"
+#include "ivtv-yuv.h"
 #include <linux/firmware.h>
 
 #define IVTV_MASK_SPU_ENABLE            0xFFFFFFFE
@@ -225,11 +226,14 @@ int ivtv_firmware_init(struct ivtv *itv)
                 return 0;
 
         itv->dec_mbox.mbox = ivtv_search_mailbox(itv->dec_mem, IVTV_DECODER_SIZE);
-        if (itv->dec_mbox.mbox == NULL)
+        if (itv->dec_mbox.mbox == NULL) {
                 IVTV_ERR("Decoder mailbox not found\n");
-        else if (itv->has_cx23415 && ivtv_vapi(itv, CX2341X_DEC_PING_FW, 0)) {
+        } else if (itv->has_cx23415 && ivtv_vapi(itv, CX2341X_DEC_PING_FW, 0)) {
                 IVTV_ERR("Decoder firmware dead!\n");
                 itv->dec_mbox.mbox = NULL;
+        } else {
+                /* Firmware okay, so check yuv output filter table */
+                ivtv_yuv_filter_check(itv);
         }
         return itv->dec_mbox.mbox ? 0 : -ENODEV;
 }