* [PATCH] ASoC: n810: replace BUG() with BUG_ON()
@ 2009-04-12 1:04 Alexander Beregalov
2009-04-12 9:39 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Beregalov @ 2009-04-12 1:04 UTC (permalink / raw)
To: alsa-devel
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
sound/soc/omap/n810.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index a6d1178..e54e1c2 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -383,10 +383,9 @@ static int __init n810_soc_init(void)
clk_set_parent(sys_clkout2_src, func96m_clk);
clk_set_rate(sys_clkout2, 12000000);
- if (gpio_request(N810_HEADSET_AMP_GPIO, "hs_amp") < 0)
- BUG();
- if (gpio_request(N810_SPEAKER_AMP_GPIO, "spk_amp") < 0)
- BUG();
+ BUG_ON((gpio_request(N810_HEADSET_AMP_GPIO, "hs_amp") < 0) ||
+ (gpio_request(N810_SPEAKER_AMP_GPIO, "spk_amp") < 0));
+
gpio_direction_output(N810_HEADSET_AMP_GPIO, 0);
gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: n810: replace BUG() with BUG_ON()
2009-04-12 1:04 [PATCH] ASoC: n810: replace BUG() with BUG_ON() Alexander Beregalov
@ 2009-04-12 9:39 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2009-04-12 9:39 UTC (permalink / raw)
To: Alexander Beregalov; +Cc: alsa-devel
On Sun, Apr 12, 2009 at 05:04:43AM +0400, Alexander Beregalov wrote:
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-04-12 9:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-12 1:04 [PATCH] ASoC: n810: replace BUG() with BUG_ON() Alexander Beregalov
2009-04-12 9:39 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.