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
196 if (clk_pout) {196 if (clk_pout) {
197 pout = clk_get(NULL, "CLK_POUT");197 pout = clk_get(NULL, "CLK_POUT");
198 if (IS_ERR(pout)) {198 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",
200 PTR_ERR(pout));200 PTR_ERR(pout));
201 return PTR_ERR(pout);201 return PTR_ERR(pout);
202 }202 }
203 203
204 ret = clk_enable(pout);204 ret = clk_enable(pout);
205 if (ret != 0) {205 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",
207 ret);207 ret);
208 clk_put(pout);208 clk_put(pout);
209 return ret;209 return ret;
210 }210 }
211 211
212 dev_dbg(&pdev->dev, "MCLK enabled at %luHz\n",212 dev_dbg(card->dev, "MCLK enabled at %luHz\n",
213 clk_get_rate(pout));213 clk_get_rate(pout));
214 }214 }
215 215
@@ -241,7 +241,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card) · 25 unmodified lines
241 if (clk_pout) {241 if (clk_pout) {
242 ret = clk_enable(pout);242 ret = clk_enable(pout);
243 if (ret != 0)243 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",
245 ret);245 ret);
246 }246 }
247 247

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