2 files changed, 17 insertions, 5 deletions

diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 67bda9f9a44..9c12bd39cfb 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -625,6 +625,22 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
         struct v4l2_tuner *vt = arg;
         struct v4l2_routing *route = arg;
 
+        /* ignore these commands */
+        switch (cmd) {
+                case TUNER_SET_TYPE_ADDR:
+                        return 0;
+        }
+
+        if (!state->is_initialized) {
+                v4l_dbg(1, cx25840_debug, client, "cmd %08x triggered fw load\n", cmd);
+                /* initialize on first use */
+                state->is_initialized = 1;
+                if (state->is_cx25836)
+                        cx25836_initialize(client);
+                else
+                        cx25840_initialize(client, 1);
+        }
+
         switch (cmd) {
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         /* ioctls to allow direct access to the
@@ -906,11 +922,6 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
 
         i2c_attach_client(client);
 
-        if (state->is_cx25836)
-                cx25836_initialize(client);
-        else
-                cx25840_initialize(client, 1);
-
         return 0;
 }
 
diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h
index f4b56d2fd6b..8c1fbd9b87c 100644
--- a/drivers/media/video/cx25840/cx25840-core.h
+++ b/drivers/media/video/cx25840/cx25840-core.h
@@ -46,6 +46,7 @@ struct cx25840_state {
         u32 id;
         u32 rev;
         int is_cx25836;
+        int is_initialized;
 };
 
 /* ----------------------------------------------------------------------- */