diff options
-rw-r--r-- | drivers/media/video/tvaudio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index a75560540e79..01ebcec040c4 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
@@ -1571,14 +1571,14 @@ static int tvaudio_get_ctrl(struct CHIPSTATE *chip, | |||
1571 | ctrl->value=chip->muted; | 1571 | ctrl->value=chip->muted; |
1572 | return 0; | 1572 | return 0; |
1573 | case V4L2_CID_AUDIO_VOLUME: | 1573 | case V4L2_CID_AUDIO_VOLUME: |
1574 | if (!desc->flags & CHIP_HAS_VOLUME) | 1574 | if (!(desc->flags & CHIP_HAS_VOLUME)) |
1575 | break; | 1575 | break; |
1576 | ctrl->value = max(chip->left,chip->right); | 1576 | ctrl->value = max(chip->left,chip->right); |
1577 | return 0; | 1577 | return 0; |
1578 | case V4L2_CID_AUDIO_BALANCE: | 1578 | case V4L2_CID_AUDIO_BALANCE: |
1579 | { | 1579 | { |
1580 | int volume; | 1580 | int volume; |
1581 | if (!desc->flags & CHIP_HAS_VOLUME) | 1581 | if (!(desc->flags & CHIP_HAS_VOLUME)) |
1582 | break; | 1582 | break; |
1583 | volume = max(chip->left,chip->right); | 1583 | volume = max(chip->left,chip->right); |
1584 | if (volume) | 1584 | if (volume) |
@@ -1621,7 +1621,7 @@ static int tvaudio_set_ctrl(struct CHIPSTATE *chip, | |||
1621 | { | 1621 | { |
1622 | int volume,balance; | 1622 | int volume,balance; |
1623 | 1623 | ||
1624 | if (!desc->flags & CHIP_HAS_VOLUME) | 1624 | if (!(desc->flags & CHIP_HAS_VOLUME)) |
1625 | break; | 1625 | break; |
1626 | 1626 | ||
1627 | volume = max(chip->left,chip->right); | 1627 | volume = max(chip->left,chip->right); |
@@ -1642,7 +1642,7 @@ static int tvaudio_set_ctrl(struct CHIPSTATE *chip, | |||
1642 | case V4L2_CID_AUDIO_BALANCE: | 1642 | case V4L2_CID_AUDIO_BALANCE: |
1643 | { | 1643 | { |
1644 | int volume, balance; | 1644 | int volume, balance; |
1645 | if (!desc->flags & CHIP_HAS_VOLUME) | 1645 | if (!(desc->flags & CHIP_HAS_VOLUME)) |
1646 | break; | 1646 | break; |
1647 | 1647 | ||
1648 | volume = max(chip->left,chip->right); | 1648 | volume = max(chip->left,chip->right); |
@@ -1702,7 +1702,7 @@ static int chip_command(struct i2c_client *client, | |||
1702 | break; | 1702 | break; |
1703 | case V4L2_CID_AUDIO_VOLUME: | 1703 | case V4L2_CID_AUDIO_VOLUME: |
1704 | case V4L2_CID_AUDIO_BALANCE: | 1704 | case V4L2_CID_AUDIO_BALANCE: |
1705 | if (!desc->flags & CHIP_HAS_VOLUME) | 1705 | if (!(desc->flags & CHIP_HAS_VOLUME)) |
1706 | return -EINVAL; | 1706 | return -EINVAL; |
1707 | break; | 1707 | break; |
1708 | case V4L2_CID_AUDIO_BASS: | 1708 | case V4L2_CID_AUDIO_BASS: |