diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /drivers/media/video/ks0127.c | |
| parent | c46c948260f41af18b277c1eb1895d788d3605dc (diff) | |
| parent | af7c951d76708c61b862463d579d76be757130bf (diff) | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
Diffstat (limited to 'drivers/media/video/ks0127.c')
| -rw-r--r-- | drivers/media/video/ks0127.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c index 4895540be195..2fd4b4a44aa9 100644 --- a/drivers/media/video/ks0127.c +++ b/drivers/media/video/ks0127.c | |||
| @@ -679,26 +679,27 @@ static int ks0127_command(struct i2c_client *client, | |||
| 679 | 679 | ||
| 680 | case DECODER_ENABLE_OUTPUT: | 680 | case DECODER_ENABLE_OUTPUT: |
| 681 | { | 681 | { |
| 682 | int enable; | ||
| 682 | 683 | ||
| 683 | int *iarg = arg; | 684 | iarg = arg; |
| 684 | int enable = (*iarg != 0); | 685 | enable = (*iarg != 0); |
| 685 | if (enable) { | 686 | if (enable) { |
| 686 | dprintk("ks0127: command " | 687 | dprintk("ks0127: command " |
| 687 | "DECODER_ENABLE_OUTPUT on " | 688 | "DECODER_ENABLE_OUTPUT on " |
| 688 | "(%d)\n", enable); | 689 | "(%d)\n", enable); |
| 689 | /* All output pins on */ | 690 | /* All output pins on */ |
| 690 | ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x30); | 691 | ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x30); |
| 691 | /* Obey the OEN pin */ | 692 | /* Obey the OEN pin */ |
| 692 | ks0127_and_or(ks, KS_CDEM, 0x7f, 0x00); | 693 | ks0127_and_or(ks, KS_CDEM, 0x7f, 0x00); |
| 693 | } else { | 694 | } else { |
| 694 | dprintk("ks0127: command " | 695 | dprintk("ks0127: command " |
| 695 | "DECODER_ENABLE_OUTPUT off " | 696 | "DECODER_ENABLE_OUTPUT off " |
| 696 | "(%d)\n", enable); | 697 | "(%d)\n", enable); |
| 697 | /* Video output pins off */ | 698 | /* Video output pins off */ |
| 698 | ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x00); | 699 | ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x00); |
| 699 | /* Ignore the OEN pin */ | 700 | /* Ignore the OEN pin */ |
| 700 | ks0127_and_or(ks, KS_CDEM, 0x7f, 0x80); | 701 | ks0127_and_or(ks, KS_CDEM, 0x7f, 0x80); |
| 701 | } | 702 | } |
| 702 | } | 703 | } |
| 703 | break; | 704 | break; |
| 704 | 705 | ||