diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-17 08:35:59 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:03:50 -0500 |
commit | d8f69971d8d6c137e42928492f8d469078113db9 (patch) | |
tree | aede2d298ab43883f18e28f622c66ed88947458c | |
parent | 36e05a44756efe562ad1f49ada9bd6a598242828 (diff) |
V4L/DVB (6836): Fix CodingStyle troubles caused by the previous cx88 commits
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 10 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index d83facf00dc6..5f79442924fd 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -594,13 +594,11 @@ static int blackbird_start_codec(struct file *file, void *priv) | |||
594 | int lastchange = -1; | 594 | int lastchange = -1; |
595 | int lastval = 0; | 595 | int lastval = 0; |
596 | 596 | ||
597 | for (i=0; (i < 10) && (i < (lastchange + 4)); i++) | 597 | for (i = 0; (i < 10) && (i < (lastchange + 4)); i++) { |
598 | { | ||
599 | reg = cx_read(AUD_STATUS); | 598 | reg = cx_read(AUD_STATUS); |
600 | 599 | ||
601 | dprintk(1,"AUD_STATUS:%dL: 0x%x\n", i, reg); | 600 | dprintk(1, "AUD_STATUS:%dL: 0x%x\n", i, reg); |
602 | if ((reg & 0x0F) != lastval) | 601 | if ((reg & 0x0F) != lastval) { |
603 | { | ||
604 | lastval = reg & 0x0F; | 602 | lastval = reg & 0x0F; |
605 | lastchange = i; | 603 | lastchange = i; |
606 | } | 604 | } |
@@ -610,7 +608,7 @@ static int blackbird_start_codec(struct file *file, void *priv) | |||
610 | /* unmute audio source */ | 608 | /* unmute audio source */ |
611 | cx_clear(AUD_VOL_CTL, (1 << 6)); | 609 | cx_clear(AUD_VOL_CTL, (1 << 6)); |
612 | 610 | ||
613 | blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0,0); | 611 | blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0, 0); |
614 | 612 | ||
615 | /* initialize the video input */ | 613 | /* initialize the video input */ |
616 | blackbird_api_cmd(dev, CX2341X_ENC_INITIALIZE_INPUT, 0, 0); | 614 | blackbird_api_cmd(dev, CX2341X_ENC_INITIALIZE_INPUT, 0, 0); |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index c8a5cd5eedf3..7f1931aed207 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -421,7 +421,7 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input) | |||
421 | 421 | ||
422 | route.input = INPUT(input).audioroute; | 422 | route.input = INPUT(input).audioroute; |
423 | cx88_call_i2c_clients(core, | 423 | cx88_call_i2c_clients(core, |
424 | VIDIOC_INT_S_AUDIO_ROUTING,&route); | 424 | VIDIOC_INT_S_AUDIO_ROUTING, &route); |
425 | 425 | ||
426 | } | 426 | } |
427 | 427 | ||