Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 12:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (3100): fix compile error, remove dead code and volume scaling

Browse Source 
- 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>
This commit is contained in:
Hans Verkuil 2006-01-09 15:25:14 -02:00 committed by Mauro Carvalho Chehab
parent c0477ad9fe
commit 7865c44d8a
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/em28xx/em28xx-video.c
View File

@ -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 <

21
drivers/media/video/msp3400.c
View File

@ -473,10 +473,8 @@ static void msp3400c_setvolume(struct i2c_client *client,
int vol = 0, val = 0, balance = 0;
if (!muted) {
/* 0x7f instead if 0x73 here has sound quality issues,
* probably due to overmodulation + clipping ... */
vol = (left > right) ? left : right;
val = (vol * 0x73 / 65535) << 8;
val = (vol * 0x7f / 65535) << 8;
}
if (vol > 0) {
balance = ((right - left) * 127) / vol;
@ -2351,21 +2349,12 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
/* done */
i2c_attach_client(client);
/* update our own array */
for (i = 0; i < MSP3400_MAX; i++) {
if (NULL == msps[i]) {
msps[i] = client;
break;
}
}
return 0;
}
static int msp_detach(struct i2c_client *client)
{
struct msp3400c *msp = i2c_get_clientdata(client);
int i;
/* shutdown control thread */
if (msp->kthread) {
@ -2374,14 +2363,6 @@ static int msp_detach(struct i2c_client *client)
}
msp3400c_reset(client);
/* update our own array */
for (i = 0; i < MSP3400_MAX; i++) {
if (client == msps[i]) {
msps[i] = NULL;
break;
}
}
i2c_detach_client(client);
kfree(msp);