diff options
Diffstat (limited to 'sound/ppc/tumbler.c')
| -rw-r--r-- | sound/ppc/tumbler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 20afdf9772ee..9cea84c3e0c6 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
| @@ -785,7 +785,7 @@ static int snapper_set_capture_source(struct pmac_tumbler *mix) | |||
| 785 | if (! mix->i2c.client) | 785 | if (! mix->i2c.client) |
| 786 | return -ENODEV; | 786 | return -ENODEV; |
| 787 | if (mix->capture_source) | 787 | if (mix->capture_source) |
| 788 | mix->acs = mix->acs |= 2; | 788 | mix->acs |= 2; |
| 789 | else | 789 | else |
| 790 | mix->acs &= ~2; | 790 | mix->acs &= ~2; |
| 791 | return i2c_smbus_write_byte_data(mix->i2c.client, TAS_REG_ACS, mix->acs); | 791 | return i2c_smbus_write_byte_data(mix->i2c.client, TAS_REG_ACS, mix->acs); |
| @@ -1000,7 +1000,7 @@ static void device_change_handler(struct work_struct *work) | |||
| 1000 | chip->lineout_sw_ctl); | 1000 | chip->lineout_sw_ctl); |
| 1001 | if (mix->anded_reset) | 1001 | if (mix->anded_reset) |
| 1002 | msleep(10); | 1002 | msleep(10); |
| 1003 | check_mute(chip, &mix->amp_mute, 1, mix->auto_mute_notify, | 1003 | check_mute(chip, &mix->amp_mute, !IS_G4DA, mix->auto_mute_notify, |
| 1004 | chip->speaker_sw_ctl); | 1004 | chip->speaker_sw_ctl); |
| 1005 | } else { | 1005 | } else { |
| 1006 | /* unmute speaker, mute others */ | 1006 | /* unmute speaker, mute others */ |