diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:31:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:31:22 +0200 |
| commit | ab2a0e0d135490729e384c1826d118f92e88cae8 (patch) | |
| tree | 58ab1e9e5d549feac9bf3beacbb6942f50d0bed9 /drivers/media/video/msp3400-driver.c | |
| parent | 09dd9b39abf85b8fae3ea105a81825478dd227b6 (diff) | |
| parent | 2f3ab04a47c9b5e7c93400601e8f69bef0fa184a (diff) | |
| download | blackbird-op-linux-ab2a0e0d135490729e384c1826d118f92e88cae8.tar.gz blackbird-op-linux-ab2a0e0d135490729e384c1826d118f92e88cae8.zip | |
Merge branch 'next-samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Diffstat (limited to 'drivers/media/video/msp3400-driver.c')
| -rw-r--r-- | drivers/media/video/msp3400-driver.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c index de5d481b0328..c43c81f5f978 100644 --- a/drivers/media/video/msp3400-driver.c +++ b/drivers/media/video/msp3400-driver.c @@ -480,12 +480,14 @@ static int msp_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) struct msp_state *state = to_state(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); - if (state->radio) + if (vt->type != V4L2_TUNER_ANALOG_TV) return 0; - if (state->opmode == OPMODE_AUTOSELECT) - msp_detect_stereo(client); - vt->audmode = state->audmode; - vt->rxsubchans = state->rxsubchans; + if (!state->radio) { + if (state->opmode == OPMODE_AUTOSELECT) + msp_detect_stereo(client); + vt->rxsubchans = state->rxsubchans; + } + vt->audmode = state->audmode; vt->capability |= V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2; return 0; |
