diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-01 10:43:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-01 10:43:46 -0300 |
| commit | 698b8c69f36ebfd0fe56ee02d9f6a4507129eb3b (patch) | |
| tree | bc02cf9d1a9365c1230fc7702fad5f4305b7eb59 /linux/drivers/media/radio | |
| parent | c72ee0800635eed6f921b1597ebeabde51e195a4 (diff) | |
| parent | 158fd570dbf7a826c6578d5b5a9036dc58059371 (diff) | |
| download | mediapointer-dvb-s2-698b8c69f36ebfd0fe56ee02d9f6a4507129eb3b.tar.gz mediapointer-dvb-s2-698b8c69f36ebfd0fe56ee02d9f6a4507129eb3b.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/radio')
| -rw-r--r-- | linux/drivers/media/radio/si4713-i2c.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/linux/drivers/media/radio/si4713-i2c.c b/linux/drivers/media/radio/si4713-i2c.c index 8cbbe48b0..6a0028eb4 100644 --- a/linux/drivers/media/radio/si4713-i2c.c +++ b/linux/drivers/media/radio/si4713-i2c.c @@ -1841,15 +1841,11 @@ 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) @@ -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) stereo = 0; else - rval = -EINVAL; - if (rval < 0) - goto exit; + return -EINVAL; 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: mutex_unlock(&sdev->mutex); -exit: return rval; } |