From d50e911da06db0911533982a6d08fcf701010997 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 17 Sep 2011 22:15:34 +0800 Subject: [PATCH] --- yaml --- r: 272503 b: refs/heads/master c: 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 h: refs/heads/master i: 272501: c30bcaf600e655d54150a09edcbd31d57d84a4ca 272499: 740cf1aa402795ae6396e1d6cb166dddfb3382ca 272495: 0d547d9b13c713c1443fd2c025def23342b44248 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/cm-x300.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 99646fffe838..ccde9c1d6cfb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c149f6c8ae47c35821d93e2bffd5a3a7ca54ad9e +refs/heads/master: 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 diff --git a/trunk/arch/arm/mach-pxa/cm-x300.c b/trunk/arch/arm/mach-pxa/cm-x300.c index b6a51340270b..3814e1243294 100644 --- a/trunk/arch/arm/mach-pxa/cm-x300.c +++ b/trunk/arch/arm/mach-pxa/cm-x300.c @@ -775,7 +775,6 @@ static struct gpio cm_x300_wi2wi_gpios[] __initdata = { static void __init cm_x300_init_wi2wi(void) { - int bt_reset, wlan_en; int err; if (system_rev < 130) { @@ -791,12 +790,11 @@ static void __init cm_x300_init_wi2wi(void) } udelay(10); - gpio_set_value(bt_reset, 0); + gpio_set_value(cm_x300_wi2wi_gpios[1].gpio, 0); udelay(10); - gpio_set_value(bt_reset, 1); + gpio_set_value(cm_x300_wi2wi_gpios[1].gpio, 1); - gpio_free(wlan_en); - gpio_free(bt_reset); + gpio_free_array(ARRAY_AND_SIZE(cm_x300_wi2wi_gpios)); } /* MFP */