diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-12 10:22:25 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-12 10:22:25 +0400 |
| commit | f46e374c1ea7fafce70a838f09fbd67de3e4d49f (patch) | |
| tree | e191e5316bdb8558bd3e2b0981c715bedd225ca7 /sound/soc/tegra/tegra_alc5632.c | |
| parent | a4d3621e0d3ecf191961dc9214e4a378a7186780 (diff) | |
| parent | eb8ca943bae2b84c3fc14dfd7a908cb334465fef (diff) | |
| download | linux-f46e374c1ea7fafce70a838f09fbd67de3e4d49f.tar.xz | |
Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: marzen: enable thermal sensor
ARM: shmobile: marzen: fixup regulator id for smsc911x
ARM: shmobile: marzen: add SDHI0 support
+ sync to 3.6-rc4
Diffstat (limited to 'sound/soc/tegra/tegra_alc5632.c')
| -rw-r--r-- | sound/soc/tegra/tegra_alc5632.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index d684df294c0c..e463529b38bb 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -177,7 +177,7 @@ static __devinit int tegra_alc5632_probe(struct platform_device *pdev) } alc5632->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); - if (alc5632->gpio_hp_det == -ENODEV) + if (alc5632->gpio_hp_det == -EPROBE_DEFER) return -EPROBE_DEFER; ret = snd_soc_of_parse_card_name(card, "nvidia,model"); |