Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 216583
b: refs/heads/master
c: 8d85d74
h: refs/heads/master
i:
  216581: f626d07
  216579: 2587717
  216575: c6c1946
v: v3
  • Loading branch information
Mark Brown committed Sep 24, 2010
1 parent adf4ddc commit 6f20500
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4a6f998ebb1e434ce83c6169a1afbe6a39015bea
refs/heads/master: 8d85d7414a681ad17f6bfc7564e310caee2c868d
3 changes: 3 additions & 0 deletions trunk/sound/soc/s3c24xx/s3c-ac97.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ static void s3c_ac97_write(struct snd_ac97 *ac97, unsigned short reg,

static void s3c_ac97_cold_reset(struct snd_ac97 *ac97)
{
pr_debug("AC97: Cold reset\n");
writel(S3C_AC97_GLBCTRL_COLDRESET,
s3c_ac97.regs + S3C_AC97_GLBCTRL);
msleep(1);
Expand All @@ -179,6 +180,8 @@ static void s3c_ac97_warm_reset(struct snd_ac97 *ac97)
if (stat == S3C_AC97_GLBSTAT_MAINSTATE_ACTIVE)
return; /* Return if already active */

pr_debug("AC97: Warm reset\n");

writel(S3C_AC97_GLBCTRL_WARMRESET, s3c_ac97.regs + S3C_AC97_GLBCTRL);
msleep(1);

Expand Down

0 comments on commit 6f20500

Please sign in to comment.