Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eff919ac authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown
Browse files

ASoC: use a valid device for dev_err() in Zylonite 



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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
parent 9058020c

sound/soc/pxa/zylonite.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -196,20 +196,20 @@ static int zylonite_probe(struct snd_soc_card *card) 
	if (clk_pout) {

	if (clk_pout) {

		pout = clk_get(NULL, "CLK_POUT");

		pout = clk_get(NULL, "CLK_POUT");

		if (IS_ERR(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));

				PTR_ERR(pout));

			return PTR_ERR(pout);

			return PTR_ERR(pout);

		}

		}





		ret = clk_enable(pout);

		ret = clk_enable(pout);

		if (ret != 0) {

		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);

				ret);

			clk_put(pout);

			clk_put(pout);

			return ret;

			return ret;

		}

		}





		dev_dbg(&pdev->dev, "MCLK enabled at %luHz\n",

		dev_dbg(card->dev, "MCLK enabled at %luHz\n",

			clk_get_rate(pout));

			clk_get_rate(pout));

	}

	}
@@ -241,7 +241,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card) 
	if (clk_pout) {

	if (clk_pout) {

		ret = clk_enable(pout);

		ret = clk_enable(pout);

		if (ret != 0)

		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);

				ret);

	}

	}