git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[media] tvaudio: fix compiler warnings
[pandora-kernel.git]
/
drivers
/
media
/
video
/
tvaudio.c
diff --git
a/drivers/media/video/tvaudio.c
b/drivers/media/video/tvaudio.c
index
c46a3bb
..
f22dbef
100644
(file)
--- a/
drivers/media/video/tvaudio.c
+++ b/
drivers/media/video/tvaudio.c
@@
-1695,14
+1695,17
@@
static int tvaudio_s_ctrl(struct v4l2_subdev *sd,
case V4L2_CID_AUDIO_BALANCE:
{
int volume, balance;
case V4L2_CID_AUDIO_BALANCE:
{
int volume, balance;
+
if (!(desc->flags & CHIP_HAS_VOLUME))
break;
if (!(desc->flags & CHIP_HAS_VOLUME))
break;
- volume = max(chip->left,chip->right);
+ volume = max(chip->left,
chip->right);
balance = ctrl->value;
balance = ctrl->value;
+ chip->left = (min(65536 - balance, 32768) * volume) / 32768;
+ chip->right = (min(balance, volume * (__u16)32768)) / 32768;
- chip_write(chip,
desc->leftreg,
desc->volfunc(chip->left));
- chip_write(chip,
desc->rightreg,
desc->volfunc(chip->right));
+ chip_write(chip,
desc->leftreg,
desc->volfunc(chip->left));
+ chip_write(chip,
desc->rightreg,
desc->volfunc(chip->right));
return 0;
}
return 0;
}