diff options
| author | Hans Verkuil <devnull@localhost> | 2005-12-02 20:12:36 +0000 |
|---|---|---|
| committer | Hans Verkuil <devnull@localhost> | 2005-12-02 20:12:36 +0000 |
| commit | ce248b700d20e20f26e8a01d353aece4810eb144 (patch) | |
| tree | 608bcbaf5c4d230cbb7f7f51a33a937fed388220 /linux/drivers/media/video/em28xx | |
| parent | ab625030b5323e2c45002cb0941e411ef1461a5e (diff) | |
| download | mediapointer-dvb-s2-ce248b700d20e20f26e8a01d353aece4810eb144.tar.gz mediapointer-dvb-s2-ce248b700d20e20f26e8a01d353aece4810eb144.tar.bz2 | |
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>
Diffstat (limited to 'linux/drivers/media/video/em28xx')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index aa530073e..73fcf8a76 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -1193,9 +1193,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 < |