diff options
author | Roland Stigge <stigge@antcom.de> | 2012-06-18 12:42:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-26 17:24:44 -0400 |
commit | 0a88f1f01c5f03f7a21a83aa52454aa930742418 (patch) | |
tree | 5eaf8db0bcb9ab0f9ef02aefc2eb6c181a4accf0 /sound/soc/tegra/tegra_wm8903.c | |
parent | e13ab2aac7a273a890d18bb482849610be178bc5 (diff) |
sound: tegra_wm8903: Adjust to of_get_named_gpio() change
of_get_named_gpio() was changed to return -EPROBE_DEFER in case of
gpios not probed yet. This patch adjusts tegra_wm8903 to this.
Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra/tegra_wm8903.c')
-rw-r--r-- | sound/soc/tegra/tegra_wm8903.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index 0c5bb33d258e..d4f14e492341 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c | |||
@@ -284,27 +284,27 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) | |||
284 | } else if (np) { | 284 | } else if (np) { |
285 | pdata->gpio_spkr_en = of_get_named_gpio(np, | 285 | pdata->gpio_spkr_en = of_get_named_gpio(np, |
286 | "nvidia,spkr-en-gpios", 0); | 286 | "nvidia,spkr-en-gpios", 0); |
287 | if (pdata->gpio_spkr_en == -ENODEV) | 287 | if (pdata->gpio_spkr_en == -EPROBE_DEFER) |
288 | return -EPROBE_DEFER; | 288 | return -EPROBE_DEFER; |
289 | 289 | ||
290 | pdata->gpio_hp_mute = of_get_named_gpio(np, | 290 | pdata->gpio_hp_mute = of_get_named_gpio(np, |
291 | "nvidia,hp-mute-gpios", 0); | 291 | "nvidia,hp-mute-gpios", 0); |
292 | if (pdata->gpio_hp_mute == -ENODEV) | 292 | if (pdata->gpio_hp_mute == -EPROBE_DEFER) |
293 | return -EPROBE_DEFER; | 293 | return -EPROBE_DEFER; |
294 | 294 | ||
295 | pdata->gpio_hp_det = of_get_named_gpio(np, | 295 | pdata->gpio_hp_det = of_get_named_gpio(np, |
296 | "nvidia,hp-det-gpios", 0); | 296 | "nvidia,hp-det-gpios", 0); |
297 | if (pdata->gpio_hp_det == -ENODEV) | 297 | if (pdata->gpio_hp_det == -EPROBE_DEFER) |
298 | return -EPROBE_DEFER; | 298 | return -EPROBE_DEFER; |
299 | 299 | ||
300 | pdata->gpio_int_mic_en = of_get_named_gpio(np, | 300 | pdata->gpio_int_mic_en = of_get_named_gpio(np, |
301 | "nvidia,int-mic-en-gpios", 0); | 301 | "nvidia,int-mic-en-gpios", 0); |
302 | if (pdata->gpio_int_mic_en == -ENODEV) | 302 | if (pdata->gpio_int_mic_en == -EPROBE_DEFER) |
303 | return -EPROBE_DEFER; | 303 | return -EPROBE_DEFER; |
304 | 304 | ||
305 | pdata->gpio_ext_mic_en = of_get_named_gpio(np, | 305 | pdata->gpio_ext_mic_en = of_get_named_gpio(np, |
306 | "nvidia,ext-mic-en-gpios", 0); | 306 | "nvidia,ext-mic-en-gpios", 0); |
307 | if (pdata->gpio_ext_mic_en == -ENODEV) | 307 | if (pdata->gpio_ext_mic_en == -EPROBE_DEFER) |
308 | return -EPROBE_DEFER; | 308 | return -EPROBE_DEFER; |
309 | } | 309 | } |
310 | 310 | ||