Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits)
  V4L/DVB (5010): Cx88: Fix leadtek_eeprom tagging
  V4L/DVB (5012): Usbvision fix: It was using "&&" instead "&"
  V4L/DVB (5001): Add two required headers on kernel 2.6.20-rc1
  V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch
  V4L/DVB (4997): Bttv: delete duplicated ioremap()
  V4L/DVB (4996): Msp3400: fix kthread_run error check
  V4L/DVB (4995): Vivi: fix kthread_run() error check
  V4L/DVB (4994): Vivi: fix use after free in list_for_each()
  V4L/DVB (4992): Fix typo in saa7134-dvb.c
  V4L/DVB (4991): Cafe_ccic.c: fix NULL dereference
  V4L/DVB (4990): Cpia2/cpia2_usb.c: fix error-path leak
  V4L/DVB (4988): Cx2341x audio_properties is an u16, not u8
  V4L/DVB (4984): LOG_STATUS should show the real temporal filter value.
  V4L/DVB (4983): Force temporal filter to 0 when scaling to prevent ghosting.
  V4L/DVB (4982): Fix broken audio mode handling for line-in in msp3400.
  V4L/DVB (4980): Fixes bug 7267: PAL/60 is not working
  V4L/DVB (4979): Fixes compilation when CONFIG_V4L1_COMPAT is not selected
  V4L/DVB (4973): Dvb-core: fix printk type warning
  V4L/DVB (4972): Dvb-core: fix bug in CRC-32 checking on 64-bit systems
  V4L/DVB (4970): Usbvision memory fixes
  ...

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index 4c7f85b566a0..e1821eb82fb5 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -483,7 +483,6 @@ int msp3400c_thread(void *data)
                         /* no carrier scan, just unmute */
                         v4l_dbg(1, msp_debug, client, "thread: no carrier scan\n");
                         state->scan_in_progress = 0;
-                        state->rxsubchans = V4L2_TUNER_SUB_STEREO;
                         msp_set_audio(client);
                         continue;
                 }
@@ -851,12 +850,15 @@ static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in)
                 source = 1; /* stereo or A|B */
                 matrix = 0x20;
                 break;
-        case V4L2_TUNER_MODE_STEREO:
         case V4L2_TUNER_MODE_LANG1:
-        default:
                 source = 3; /* stereo or A */
                 matrix = 0x00;
                 break;
+        case V4L2_TUNER_MODE_STEREO:
+        default:
+                source = 3; /* stereo or A */
+                matrix = 0x20;
+                break;
         }
 
         if (in == MSP_DSP_IN_TUNER)
@@ -1030,6 +1032,9 @@ static int msp34xxg_detect_stereo(struct i2c_client *client)
         int is_stereo = status & 0x40;
         int oldrx = state->rxsubchans;
 
+        if (state->mode == MSP_MODE_EXTERN)
+                return 0;
+
         state->rxsubchans = 0;
         if (is_stereo)
                 state->rxsubchans = V4L2_TUNER_SUB_STEREO;