diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 16:21:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 16:21:08 +0900 |
| commit | 540565257101f7c52b6fc5a57651f7505f8d20fe (patch) | |
| tree | 7adee0bc65a02fead0dd9cae4f2d4632b227ac56 /sound/atmel/abdac.c | |
| parent | 4d048435e9864998f6a6ad16422393d42322716d (diff) | |
| parent | 421b446abeec55bed1251fab80cb5c12be58b773 (diff) | |
| download | linux-540565257101f7c52b6fc5a57651f7505f8d20fe.tar.gz linux-540565257101f7c52b6fc5a57651f7505f8d20fe.tar.bz2 linux-540565257101f7c52b6fc5a57651f7505f8d20fe.zip | |
Merge branch 'rmobile/fsi-despair' into rmobile-fixes-for-linus
Diffstat (limited to 'sound/atmel/abdac.c')
| -rw-r--r-- | sound/atmel/abdac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c index f2f41c854221..6e2409181895 100644 --- a/sound/atmel/abdac.c +++ b/sound/atmel/abdac.c @@ -420,9 +420,9 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev) return PTR_ERR(pclk); } sample_clk = clk_get(&pdev->dev, "sample_clk"); - if (IS_ERR(pclk)) { + if (IS_ERR(sample_clk)) { dev_dbg(&pdev->dev, "no sample clock\n"); - retval = PTR_ERR(pclk); + retval = PTR_ERR(sample_clk); goto out_put_pclk; } clk_enable(pclk); |