diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-08 16:45:38 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-11-08 16:45:38 +0100 |
| commit | a6bc732b5a96b5403c2637e85c350b95ec6591f3 (patch) | |
| tree | 4b1c3967cd1de42a5e36e567cbdd18e1f4e8446f /sound/soc/omap | |
| parent | 9a22a8f558d09a83965d2bbe168294eb8ffb70e9 (diff) | |
| parent | dd212bd5bb8b15889821ef79213cdb5bd47c6f85 (diff) | |
| download | op-kernel-dev-a6bc732b5a96b5403c2637e85c350b95ec6591f3.zip op-kernel-dev-a6bc732b5a96b5403c2637e85c350b95ec6591f3.tar.gz | |
Merge tag 'asoc-v3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.13
Some additional fixes for v3.13, the majority of which are removals and
downgrades of BUG()s from Takashi.
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/n810.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 5e8d640..6d216cb 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -344,8 +344,11 @@ static int __init n810_soc_init(void) clk_set_parent(sys_clkout2_src, func96m_clk); clk_set_rate(sys_clkout2, 12000000); - BUG_ON((gpio_request(N810_HEADSET_AMP_GPIO, "hs_amp") < 0) || - (gpio_request(N810_SPEAKER_AMP_GPIO, "spk_amp") < 0)); + if (WARN_ON((gpio_request(N810_HEADSET_AMP_GPIO, "hs_amp") < 0) || + (gpio_request(N810_SPEAKER_AMP_GPIO, "spk_amp") < 0))) { + err = -EINVAL; + goto err4; + } gpio_direction_output(N810_HEADSET_AMP_GPIO, 0); gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0); |
