Skip to content

Commit

Permalink
V4L/DVB (12612): si4713: simplify the code to remove a compiler warning.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Sep 12, 2009
1 parent a4c1cbc commit a65f315
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions drivers/media/radio/si4713-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -1841,25 +1841,19 @@ static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)
u16 stereo, rds;
u32 p;

if (!sdev) {
rval = -ENODEV;
goto exit;
}
if (!sdev)
return -ENODEV;

if (vm->index > 0) {
rval = -EINVAL;
goto exit;
}
if (vm->index > 0)
return -EINVAL;

/* Set audio mode: mono or stereo */
if (vm->txsubchans & V4L2_TUNER_SUB_STEREO)
stereo = 1;
else if (vm->txsubchans & V4L2_TUNER_SUB_MONO)
stereo = 0;
else
rval = -EINVAL;
if (rval < 0)
goto exit;
return -EINVAL;

rds = !!(vm->txsubchans & V4L2_TUNER_SUB_RDS);

Expand All @@ -1885,7 +1879,6 @@ static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)

unlock:
mutex_unlock(&sdev->mutex);
exit:
return rval;
}

Expand Down

0 comments on commit a65f315

Please sign in to comment.