diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /drivers/media/video/tvaudio.c | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'drivers/media/video/tvaudio.c')
| -rw-r--r-- | drivers/media/video/tvaudio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index 463680b13289..b59e47272abf 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
| @@ -1792,7 +1792,7 @@ static int chip_command(struct i2c_client *client, | |||
| 1792 | break; | 1792 | break; |
| 1793 | case VIDIOC_S_FREQUENCY: | 1793 | case VIDIOC_S_FREQUENCY: |
| 1794 | chip->mode = 0; /* automatic */ | 1794 | chip->mode = 0; /* automatic */ |
| 1795 | if (desc->checkmode) { | 1795 | if (desc->checkmode && desc->setmode) { |
| 1796 | desc->setmode(chip,V4L2_TUNER_MODE_MONO); | 1796 | desc->setmode(chip,V4L2_TUNER_MODE_MONO); |
| 1797 | if (chip->prevmode != V4L2_TUNER_MODE_MONO) | 1797 | if (chip->prevmode != V4L2_TUNER_MODE_MONO) |
| 1798 | chip->prevmode = -1; /* reset previous mode */ | 1798 | chip->prevmode = -1; /* reset previous mode */ |