diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 21:33:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 21:33:12 +0100 |
| commit | cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e (patch) | |
| tree | a7183a2c7caf5249bd355c55f5956a948defaac6 /sound/soc/atmel | |
| parent | ASoC: Fix a memory leak in alc5623_i2c_probe error path (diff) | |
| parent | ASoC: Restore WM8994 volatile and readable register operations (diff) | |
| download | linux-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.tar.xz linux-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.zip | |
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) } 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); |