summaryrefslogtreecommitdiff
path: root/sound/soc/atmel
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 23:33:12 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 23:33:12 +0300
commitcbe80def41f2f12b1b4f8b5c4eb048d50d842d6e (patch)
treea7183a2c7caf5249bd355c55f5956a948defaac6 /sound/soc/atmel
parentc7b642911ea0fa9168425757752f094a1255209a (diff)
parenteba19fdd818dfec3782ff095591e51c9bd617403 (diff)
downloadlinux-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.tar.xz
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/atmel')
-rw-r--r--sound/soc/atmel/sam9g20_wm8731.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index da3796190b2a..1c9de19151f5 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -222,9 +222,9 @@ static int __init at91sam9g20ek_init(void)
}
pllb = clk_get(NULL, "pllb");
- if (IS_ERR(mclk)) {
+ if (IS_ERR(pllb)) {
printk(KERN_ERR "ASoC: Failed to get PLLB\n");
- ret = PTR_ERR(mclk);
+ ret = PTR_ERR(pllb);
goto err_mclk;
}
ret = clk_set_parent(mclk, pllb);