/[openvortex]/alsa/alsa-kernel/ppc/pmac.c
ViewVC logotype

Diff of /alsa/alsa-kernel/ppc/pmac.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.3 by vizard, Sun Jun 15 21:01:32 2003 UTC revision 1.4 by vizard, Mon Aug 11 00:06:40 2003 UTC
# Line 736  static void snd_pmac_sound_feature(pmac_ Line 736  static void snd_pmac_sound_feature(pmac_
736                  pmu_suspend();                  pmu_suspend();
737                  feature_clear(chip->node, FEATURE_Sound_power);                  feature_clear(chip->node, FEATURE_Sound_power);
738                  feature_clear(chip->node, FEATURE_Sound_CLK_enable);                  feature_clear(chip->node, FEATURE_Sound_CLK_enable);
739                  mdelay(1000); /* XXX */                  big_mdelay(1000); /* XXX */
740                  pmu_resume();                  pmu_resume();
741          }          }
742          if (chip->is_pbook_3400) {          if (chip->is_pbook_3400) {
# Line 1211  static void snd_pmac_suspend(pmac_t *chi Line 1211  static void snd_pmac_suspend(pmac_t *chi
1211          spin_lock_irqsave(&chip->reg_lock, flags);          spin_lock_irqsave(&chip->reg_lock, flags);
1212          snd_pmac_beep_stop(chip);          snd_pmac_beep_stop(chip);
1213          spin_unlock_irqrestore(&chip->reg_lock, flags);          spin_unlock_irqrestore(&chip->reg_lock, flags);
1214          disable_irq(chip->irq);          if (chip->irq >= 0)
1215          disable_irq(chip->tx_irq);                  disable_irq(chip->irq);
1216          disable_irq(chip->rx_irq);          if (chip->tx_irq >= 0)
1217                    disable_irq(chip->tx_irq);
1218            if (chip->rx_irq >= 0)
1219                    disable_irq(chip->rx_irq);
1220          snd_pmac_sound_feature(chip, 0);          snd_pmac_sound_feature(chip, 0);
1221          snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);          snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
1222  }  }
# Line 1237  static void snd_pmac_resume(pmac_t *chip Line 1240  static void snd_pmac_resume(pmac_t *chip
1240    
1241          snd_pmac_pcm_set_format(chip);          snd_pmac_pcm_set_format(chip);
1242    
1243          enable_irq(chip->irq);          if (chip->irq >= 0)
1244          enable_irq(chip->tx_irq);                  enable_irq(chip->irq);
1245          enable_irq(chip->rx_irq);          if (chip->tx_irq >= 0)
1246                    enable_irq(chip->tx_irq);
1247            if (chip->rx_irq >= 0)
1248                    enable_irq(chip->rx_irq);
1249    
1250          snd_power_change_state(card, SNDRV_CTL_POWER_D0);          snd_power_change_state(card, SNDRV_CTL_POWER_D0);
1251  }  }

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26