diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-05 18:40:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-07 19:55:15 +0000 |
| commit | 96b61bc546519ae90317980294c161c86bcd140e (patch) | |
| tree | 7e42af9caf7feffb0d74ae7fae740947b48b9321 /sound/soc/omap | |
| parent | 656a22a105c8135a515daae3d79ede7b472c18ec (diff) | |
| download | op-kernel-dev-96b61bc546519ae90317980294c161c86bcd140e.zip op-kernel-dev-96b61bc546519ae90317980294c161c86bcd140e.tar.gz | |
ASoC: omap: Use WARN_ON() instead of BUG_ON()
Use WARN_ON() and handle the error cases accordingly.
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
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); |
