1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index ed02ff811388..4c7f85b566a0 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -960,9 +960,10 @@ int msp34xxg_thread(void *data)
 
                 /* setup the chip*/
                 msp34xxg_reset(client);
-                state->std = state->radio ? 0x40 : msp_standard;
-                /* start autodetect */
+                state->std = state->radio ? 0x40 :
+                        (state->force_btsc && msp_standard == 1) ? 32 : msp_standard;
                 msp_write_dem(client, 0x20, state->std);
+                /* start autodetect */
                 if (state->std != 1)
                         goto unmute;