Commit d8f69971 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

V4L/DVB (6836): Fix CodingStyle troubles caused by the previous cx88 commits

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 36e05a44
...@@ -594,13 +594,11 @@ static int blackbird_start_codec(struct file *file, void *priv) ...@@ -594,13 +594,11 @@ static int blackbird_start_codec(struct file *file, void *priv)
int lastchange = -1; int lastchange = -1;
int lastval = 0; 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); reg = cx_read(AUD_STATUS);
dprintk(1,"AUD_STATUS:%dL: 0x%x\n", i, reg); dprintk(1, "AUD_STATUS:%dL: 0x%x\n", i, reg);
if ((reg & 0x0F) != lastval) if ((reg & 0x0F) != lastval) {
{
lastval = reg & 0x0F; lastval = reg & 0x0F;
lastchange = i; lastchange = i;
} }
...@@ -610,7 +608,7 @@ static int blackbird_start_codec(struct file *file, void *priv) ...@@ -610,7 +608,7 @@ static int blackbird_start_codec(struct file *file, void *priv)
/* unmute audio source */ /* unmute audio source */
cx_clear(AUD_VOL_CTL, (1 << 6)); 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 */ /* initialize the video input */
blackbird_api_cmd(dev, CX2341X_ENC_INITIALIZE_INPUT, 0, 0); blackbird_api_cmd(dev, CX2341X_ENC_INITIALIZE_INPUT, 0, 0);
......
...@@ -421,7 +421,7 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input) ...@@ -421,7 +421,7 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
route.input = INPUT(input).audioroute; route.input = INPUT(input).audioroute;
cx88_call_i2c_clients(core, cx88_call_i2c_clients(core,
VIDIOC_INT_S_AUDIO_ROUTING,&route); VIDIOC_INT_S_AUDIO_ROUTING, &route);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment