diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 23:43:22 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 23:43:22 +0400 |
| commit | 32d80f97fe4a86b7e9de5d13030432de115119b1 (patch) | |
| tree | 54b95741024e8926348fa15d43579d49f4743553 /sound/soc/pxa | |
| parent | 3a3ad60176fafb027bf2e4fe4793eab99ced5708 (diff) | |
| parent | 100aafc992039794d0facb0e7bbd02f8a11fd1d6 (diff) | |
| download | linux-32d80f97fe4a86b7e9de5d13030432de115119b1.tar.xz | |
Merge branch 'imx/fixes' into next/fixes
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/zylonite.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c index b6445757fc54..2b8350b52232 100644 --- a/sound/soc/pxa/zylonite.c +++ b/sound/soc/pxa/zylonite.c @@ -196,20 +196,20 @@ static int zylonite_probe(struct snd_soc_card *card) if (clk_pout) { pout = clk_get(NULL, "CLK_POUT"); if (IS_ERR(pout)) { - dev_err(&pdev->dev, "Unable to obtain CLK_POUT: %ld\n", + dev_err(card->dev, "Unable to obtain CLK_POUT: %ld\n", PTR_ERR(pout)); return PTR_ERR(pout); } ret = clk_enable(pout); if (ret != 0) { - dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n", + dev_err(card->dev, "Unable to enable CLK_POUT: %d\n", ret); clk_put(pout); return ret; } - dev_dbg(&pdev->dev, "MCLK enabled at %luHz\n", + dev_dbg(card->dev, "MCLK enabled at %luHz\n", clk_get_rate(pout)); } @@ -241,7 +241,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card) if (clk_pout) { ret = clk_enable(pout); if (ret != 0) - dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n", + dev_err(card->dev, "Unable to enable CLK_POUT: %d\n", ret); } |