From 11a75699aba6f0220480cc00df7a498ed7132a07 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 1 May 2005 08:58:43 -0700 Subject: [PATCH] --- yaml --- r: 649 b: refs/heads/master c: 085e6fc96bcf239cab8adc600aab2452d75590b1 h: refs/heads/master i: 647: f7b0328abf894d04af6e860322bdb5343f02a327 v: v3 --- [refs] | 2 +- trunk/sound/ppc/tumbler.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a6f863a8803f..c4ed9a8467bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f7b49d042abfbda71f41b8aff6e1bf7685c1f00 +refs/heads/master: 085e6fc96bcf239cab8adc600aab2452d75590b1 diff --git a/trunk/sound/ppc/tumbler.c b/trunk/sound/ppc/tumbler.c index f3e010793a6a..9332237cb6a4 100644 --- a/trunk/sound/ppc/tumbler.c +++ b/trunk/sound/ppc/tumbler.c @@ -99,6 +99,7 @@ typedef struct pmac_tumbler_t { pmac_gpio_t hp_detect; int headphone_irq; int lineout_irq; + unsigned int save_master_vol[2]; unsigned int master_vol[2]; unsigned int save_master_switch[2]; unsigned int master_switch[2]; @@ -1139,6 +1140,8 @@ static void tumbler_suspend(pmac_t *chip) disable_irq(mix->lineout_irq); mix->save_master_switch[0] = mix->master_switch[0]; mix->save_master_switch[1] = mix->master_switch[1]; + mix->save_master_vol[0] = mix->master_vol[0]; + mix->save_master_vol[1] = mix->master_vol[1]; mix->master_switch[0] = mix->master_switch[1] = 0; tumbler_set_master_volume(mix); if (!mix->anded_reset) { @@ -1166,6 +1169,8 @@ static void tumbler_resume(pmac_t *chip) mix->acs &= ~1; mix->master_switch[0] = mix->save_master_switch[0]; mix->master_switch[1] = mix->save_master_switch[1]; + mix->master_vol[0] = mix->save_master_vol[0]; + mix->master_vol[1] = mix->save_master_vol[1]; tumbler_reset_audio(chip); if (mix->i2c.client && mix->i2c.init_client) { if (mix->i2c.init_client(&mix->i2c) < 0)