Skip to content

Commit

Permalink
sound: tegra_wm8903: Adjust to of_get_named_gpio() change
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Roland Stigge authored and Mark Brown committed Jul 26, 2012
1 parent e13ab2a commit 0a88f1f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions sound/soc/tegra/tegra_wm8903.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,27 +284,27 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
} else if (np) {
pdata->gpio_spkr_en = of_get_named_gpio(np,
"nvidia,spkr-en-gpios", 0);
if (pdata->gpio_spkr_en == -ENODEV)
if (pdata->gpio_spkr_en == -EPROBE_DEFER)
return -EPROBE_DEFER;

pdata->gpio_hp_mute = of_get_named_gpio(np,
"nvidia,hp-mute-gpios", 0);
if (pdata->gpio_hp_mute == -ENODEV)
if (pdata->gpio_hp_mute == -EPROBE_DEFER)
return -EPROBE_DEFER;

pdata->gpio_hp_det = of_get_named_gpio(np,
"nvidia,hp-det-gpios", 0);
if (pdata->gpio_hp_det == -ENODEV)
if (pdata->gpio_hp_det == -EPROBE_DEFER)
return -EPROBE_DEFER;

pdata->gpio_int_mic_en = of_get_named_gpio(np,
"nvidia,int-mic-en-gpios", 0);
if (pdata->gpio_int_mic_en == -ENODEV)
if (pdata->gpio_int_mic_en == -EPROBE_DEFER)
return -EPROBE_DEFER;

pdata->gpio_ext_mic_en = of_get_named_gpio(np,
"nvidia,ext-mic-en-gpios", 0);
if (pdata->gpio_ext_mic_en == -ENODEV)
if (pdata->gpio_ext_mic_en == -EPROBE_DEFER)
return -EPROBE_DEFER;
}

Expand Down

0 comments on commit 0a88f1f

Please sign in to comment.