From 382985770849f3a39f1c46b6b43e981591a579b7 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Sun, 12 Apr 2009 05:04:43 +0400 Subject: [PATCH] --- yaml --- r: 148183 b: refs/heads/master c: f4c1724f3437ac70d8330968379148c954ca34c7 h: refs/heads/master i: 148181: c3e7aeb1dedc14e8692eb09e5400f268b1ffa165 148179: a8410a49b2c7a519315fd24cefb309e9c51fe2c6 148175: a91553ff8632e717ddfccdd90663394db4b36b2c v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/n810.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bdcb6f7a499f..662f62ec372f 100644 --- 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 index a6d1178ce128..e54e1c2f5e63 100644 --- 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);