History

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.

Arnd Bergmann committed 15 years ago

Commit eff919a1 parent 90580201 file · +4 −4Browse files

Unified · Split

sound/soc/pxa/zylonite.c+4−4
@@ -196,20 +196,20 @@ static int zylonite_probe(struct snd_soc_card *card) · 195 unmodified lines
196196 if (clk_pout) {
197197 pout = clk_get(NULL, "CLK_POUT");
198198 if (IS_ERR(pout)) {
199− dev_err(&pdev->dev, "Unable to obtain CLK_POUT: %ld\n",
199+ dev_err(card->dev, "Unable to obtain CLK_POUT: %ld\n",
200200 PTR_ERR(pout));
201201 return PTR_ERR(pout);
202202 }
203203
204204 ret = clk_enable(pout);
205205 if (ret != 0) {
206− dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",
206+ dev_err(card->dev, "Unable to enable CLK_POUT: %d\n",
207207 ret);
208208 clk_put(pout);
209209 return ret;
210210 }
211211
212− dev_dbg(&pdev->dev, "MCLK enabled at %luHz\n",
212+ dev_dbg(card->dev, "MCLK enabled at %luHz\n",
213213 clk_get_rate(pout));
214214 }
215215
@@ -241,7 +241,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card) · 25 unmodified lines
241241 if (clk_pout) {
242242 ret = clk_enable(pout);
243243 if (ret != 0)
244− dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",
244+ dev_err(card->dev, "Unable to enable CLK_POUT: %d\n",
245245 ret);
246246 }
247247

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t