diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-08-25 09:24:16 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-06 13:44:30 -0400 |
commit | 88af83048d3bdfe3de7aee54e7117afbc2f8dd58 (patch) | |
tree | 7d0b98f0092f7431ec008e3f5bcd9f92cfc59aa0 /drivers/media/video/tvaudio.c | |
parent | 4c04b7a1ada742aace5023aca57e537bf75b59ff (diff) |
[media] tvaudio: fix compiler warnings
This is indeed a bug: balance and volume must be used to set the left and right
channel volume. Fixed.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/tvaudio.c')
-rw-r--r-- | drivers/media/video/tvaudio.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index c46a3bb95852..f22dbef9b95b 100644 --- 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, | |||
1695 | case V4L2_CID_AUDIO_BALANCE: | 1695 | case V4L2_CID_AUDIO_BALANCE: |
1696 | { | 1696 | { |
1697 | int volume, balance; | 1697 | int volume, balance; |
1698 | |||
1698 | if (!(desc->flags & CHIP_HAS_VOLUME)) | 1699 | if (!(desc->flags & CHIP_HAS_VOLUME)) |
1699 | break; | 1700 | break; |
1700 | 1701 | ||
1701 | volume = max(chip->left,chip->right); | 1702 | volume = max(chip->left, chip->right); |
1702 | balance = ctrl->value; | 1703 | balance = ctrl->value; |
1704 | chip->left = (min(65536 - balance, 32768) * volume) / 32768; | ||
1705 | chip->right = (min(balance, volume * (__u16)32768)) / 32768; | ||
1703 | 1706 | ||
1704 | chip_write(chip,desc->leftreg,desc->volfunc(chip->left)); | 1707 | chip_write(chip, desc->leftreg, desc->volfunc(chip->left)); |
1705 | chip_write(chip,desc->rightreg,desc->volfunc(chip->right)); | 1708 | chip_write(chip, desc->rightreg, desc->volfunc(chip->right)); |
1706 | 1709 | ||
1707 | return 0; | 1710 | return 0; |
1708 | } | 1711 | } |