summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ks0127.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-08-31 08:23:58 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-08-31 08:23:58 +0200
commit83027ea1202394a80ca58ed8da84e207d855521e (patch)
treee785ac503165d57d3a5cfb88f20eff034d12199f /linux/drivers/media/video/ks0127.c
parentf1a52a2e70204db19b6c81bb59de2c759cefaaa6 (diff)
parent7804585be37d9aa982df2d476a795cbe459dae4a (diff)
downloadmediapointer-dvb-s2-83027ea1202394a80ca58ed8da84e207d855521e.tar.gz
mediapointer-dvb-s2-83027ea1202394a80ca58ed8da84e207d855521e.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/ks0127.c')
-rw-r--r--linux/drivers/media/video/ks0127.c31
1 files changed, 16 insertions, 15 deletions
diff --git a/linux/drivers/media/video/ks0127.c b/linux/drivers/media/video/ks0127.c
index 90451230d..b21b6f097 100644
--- a/linux/drivers/media/video/ks0127.c
+++ b/linux/drivers/media/video/ks0127.c
@@ -680,26 +680,27 @@ static int ks0127_command(struct i2c_client *client,
case DECODER_ENABLE_OUTPUT:
{
+ int enable;
- int *iarg = arg;
- int enable = (*iarg != 0);
- if (enable) {
- dprintk("ks0127: command "
+ iarg = arg;
+ enable = (*iarg != 0);
+ if (enable) {
+ dprintk("ks0127: command "
"DECODER_ENABLE_OUTPUT on "
"(%d)\n", enable);
- /* All output pins on */
- ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x30);
- /* Obey the OEN pin */
- ks0127_and_or(ks, KS_CDEM, 0x7f, 0x00);
- } else {
- dprintk("ks0127: command "
+ /* All output pins on */
+ ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x30);
+ /* Obey the OEN pin */
+ ks0127_and_or(ks, KS_CDEM, 0x7f, 0x00);
+ } else {
+ dprintk("ks0127: command "
"DECODER_ENABLE_OUTPUT off "
"(%d)\n", enable);
- /* Video output pins off */
- ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x00);
- /* Ignore the OEN pin */
- ks0127_and_or(ks, KS_CDEM, 0x7f, 0x80);
- }
+ /* Video output pins off */
+ ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x00);
+ /* Ignore the OEN pin */
+ ks0127_and_or(ks, KS_CDEM, 0x7f, 0x80);
+ }
}
break;