summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-17 11:35:59 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-12-17 11:35:59 -0200
commit9b9f1ee84c2c20af88227ddde46fcc3114692c89 (patch)
treee67445df022a769037551a4e3bd2e5e7ec8b8b56 /linux/drivers/media/video
parentac2cca60156d7741f25784f5ae3db3f07eb1ce8f (diff)
downloadmediapointer-dvb-s2-9b9f1ee84c2c20af88227ddde46fcc3114692c89.tar.gz
mediapointer-dvb-s2-9b9f1ee84c2c20af88227ddde46fcc3114692c89.tar.bz2
Fix CodingStyle troubles caused by the previous cx88 commits
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/cx88/cx88-blackbird.c10
-rw-r--r--linux/drivers/media/video/cx88/cx88-video.c2
2 files changed, 5 insertions, 7 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c
index d16a3cd72..c250297db 100644
--- a/linux/drivers/media/video/cx88/cx88-blackbird.c
+++ b/linux/drivers/media/video/cx88/cx88-blackbird.c
@@ -604,13 +604,11 @@ static int blackbird_start_codec(struct file *file, void *priv)
int lastchange = -1;
int lastval = 0;
- for (i=0; (i < 10) && (i < (lastchange + 4)); i++)
- {
+ for (i = 0; (i < 10) && (i < (lastchange + 4)); i++) {
reg = cx_read(AUD_STATUS);
- dprintk(1,"AUD_STATUS:%dL: 0x%x\n", i, reg);
- if ((reg & 0x0F) != lastval)
- {
+ dprintk(1, "AUD_STATUS:%dL: 0x%x\n", i, reg);
+ if ((reg & 0x0F) != lastval) {
lastval = reg & 0x0F;
lastchange = i;
}
@@ -620,7 +618,7 @@ static int blackbird_start_codec(struct file *file, void *priv)
/* unmute audio source */
cx_clear(AUD_VOL_CTL, (1 << 6));
- blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0,0);
+ blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0, 0);
/* initialize the video input */
blackbird_api_cmd(dev, CX2341X_ENC_INITIALIZE_INPUT, 0, 0);
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index fe6c66a58..ef795d353 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -437,7 +437,7 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
route.input = INPUT(input).audioroute;
cx88_call_i2c_clients(core,
- VIDIOC_INT_S_AUDIO_ROUTING,&route);
+ VIDIOC_INT_S_AUDIO_ROUTING, &route);
}