Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 92242
b: refs/heads/master
c: 4092030
h: refs/heads/master
v: v3
  • Loading branch information
Tim Niemeyer authored and Takashi Iwai committed Apr 24, 2008
1 parent 30039c4 commit 27ac6c2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ebf029da38829ede6b53ac8a5ad45b149064ea16
refs/heads/master: 409203074e9f3c423cdc7c38f984ce24ae261556
5 changes: 4 additions & 1 deletion trunk/sound/soc/s3c24xx/s3c24xx-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

#define S3C24XX_I2S_DEBUG 0
#if S3C24XX_I2S_DEBUG
#define DBG(x...) printk(KERN_DEBUG x)
#define DBG(x...) printk(KERN_DEBUG "s3c24xx-i2s: " x)
#else
#define DBG(x...)
#endif
Expand Down Expand Up @@ -414,6 +414,8 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev)
int s3c24xx_i2s_suspend(struct platform_device *pdev,
struct snd_soc_cpu_dai *cpu_dai)
{
DBG("Entered %s\n", __func__);

s3c24xx_i2s.iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON);
s3c24xx_i2s.iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
s3c24xx_i2s.iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON);
Expand All @@ -427,6 +429,7 @@ int s3c24xx_i2s_suspend(struct platform_device *pdev,
int s3c24xx_i2s_resume(struct platform_device *pdev,
struct snd_soc_cpu_dai *cpu_dai)
{
DBG("Entered %s\n", __func__);
clk_enable(s3c24xx_i2s.iis_clk);

writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON);
Expand Down
2 changes: 1 addition & 1 deletion trunk/sound/soc/s3c24xx/s3c24xx-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#define S3C24XX_PCM_DEBUG 0
#if S3C24XX_PCM_DEBUG
#define DBG(x...) printk(KERN_DEBUG x)
#define DBG(x...) printk(KERN_DEBUG "s3c24xx-pcm: " x)
#else
#define DBG(x...)
#endif
Expand Down

0 comments on commit 27ac6c2

Please sign in to comment.