Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-14 17:35:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

V4L/DVB (12612): si4713: simplify the code to remove a compiler warning.

Browse Source 
The compiler warned about an uninitialized stereo variable. By simplifying
the code it 1) improved readability and 2) fixed the compiler warning.

Acked-by: Eduardo Valentin <eduardo.valentin@nokia.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2009-08-31 17:21:04 -03:00 committed by Mauro Carvalho Chehab
parent a4c1cbc781
commit a65f315924
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/radio/si4713-i2c.c
View File

@ -1841,15 +1841,11 @@ static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)
u16 stereo, rds; u16 stereo, rds;
u32 p; u32 p;
if (!sdev) { if (!sdev)
rval = -ENODEV; return -ENODEV;
goto exit;
}
if (vm->index > 0) { if (vm->index > 0)
rval = -EINVAL; return -EINVAL;
goto exit;
}
/* Set audio mode: mono or stereo */ /* Set audio mode: mono or stereo */
if (vm->txsubchans & V4L2_TUNER_SUB_STEREO) if (vm->txsubchans & V4L2_TUNER_SUB_STEREO)
@ -1857,9 +1853,7 @@ static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)
else if (vm->txsubchans & V4L2_TUNER_SUB_MONO) else if (vm->txsubchans & V4L2_TUNER_SUB_MONO)
stereo = 0; stereo = 0;
else else
rval = -EINVAL; return -EINVAL;
if (rval < 0)
goto exit;
rds = !!(vm->txsubchans & V4L2_TUNER_SUB_RDS); rds = !!(vm->txsubchans & V4L2_TUNER_SUB_RDS);
@ -1885,7 +1879,6 @@ static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)
unlock: unlock:
mutex_unlock(&sdev->mutex); mutex_unlock(&sdev->mutex);
exit:
return rval; return rval;
} }