| From eff919ac0fc7565e71ffa35657c333dd8cdc0520 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Sat, 1 Oct 2011 22:03:34 +0200 |
| Subject: ASoC: use a valid device for dev_err() in Zylonite |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| commit eff919ac0fc7565e71ffa35657c333dd8cdc0520 upstream. |
| |
| A recent conversion has introduced references to &pdev->dev, which does |
| not actually exist in all the contexts it's used in. |
| |
| Replace this with card->dev where necessary, in order to let |
| the driver build again. |
| |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| sound/soc/pxa/zylonite.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/sound/soc/pxa/zylonite.c |
| +++ b/sound/soc/pxa/zylonite.c |
| @@ -196,20 +196,20 @@ static int zylonite_probe(struct snd_soc |
| 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 sn |
| 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); |
| } |
| |
