---

yaml --- r: 148183 b: refs/heads/master c: f4c1724 h: refs/heads/master i: 148181: c3e7aeb 148179: a8410a4 148175: a91553f v: v3
git-mirror · Apr 12, 2009 · 3829857 · 3829857
1 parent d171bbc
commit 3829857
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 894bf92fdec9909fefcfe907786c6c6944a22052
+refs/heads/master: f4c1724f3437ac70d8330968379148c954ca34c7
diff --git a/trunk/sound/soc/omap/n810.c b/trunk/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);