diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 15:33:12 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 15:33:12 -0500 |
| commit | cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e (patch) | |
| tree | a7183a2c7caf5249bd355c55f5956a948defaac6 /sound/soc/atmel | |
| parent | c7b642911ea0fa9168425757752f094a1255209a (diff) | |
| parent | eba19fdd818dfec3782ff095591e51c9bd617403 (diff) | |
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.c | 4 |
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) | |||
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | pllb = clk_get(NULL, "pllb"); | 224 | pllb = clk_get(NULL, "pllb"); |
| 225 | if (IS_ERR(mclk)) { | 225 | if (IS_ERR(pllb)) { |
| 226 | printk(KERN_ERR "ASoC: Failed to get PLLB\n"); | 226 | printk(KERN_ERR "ASoC: Failed to get PLLB\n"); |
| 227 | ret = PTR_ERR(mclk); | 227 | ret = PTR_ERR(pllb); |
| 228 | goto err_mclk; | 228 | goto err_mclk; |
| 229 | } | 229 | } |
| 230 | ret = clk_set_parent(mclk, pllb); | 230 | ret = clk_set_parent(mclk, pllb); |