diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-01-09 17:25:14 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 17:25:14 (GMT) |
| commit | 7865c44d8ae832d6fb6522862268c7bd7814fd44 (patch) | |
| tree | d320c60c02d0c0c7da3eeac9825356de57c3252b /drivers/media/video/em28xx | |
| parent | c0477ad9feca01bd8eff95d7482c33753d05c700 (diff) | |
| download | linux-fsl-qoriq-7865c44d8ae832d6fb6522862268c7bd7814fd44.tar.xz | |
V4L/DVB (3100): fix compile error, remove dead code and volume scaling
- Fix compile error (missing '}') in em28xx-video.c. Remove dead code and
volume scaling from msp3400.c. Volume scaling does not belong there, it should
be done in the driver for the card that uses the msp3400 if needed, not in the
msp3400.c source. The volume scaling code gave problems with the ivtv driver
which does not need to do any scaling.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/em28xx')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 446ba3b..5e831fc 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c @@ -1089,9 +1089,7 @@ static int em28xx_do_ioctl(struct inode *inode, struct file *filp, if (dev->decoder == EM28XX_TVP5150) { em28xx_i2c_call_clients(dev,cmd,arg); return 0; - } else { - - if (!dev->has_msp34xx){ + } else if (!dev->has_msp34xx) { for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) { if (ctrl->id == em28xx_qctrl[i].id) { if (ctrl->value < |