| From 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 Mon Sep 17 00:00:00 2001 |
| From: Axel Lin <axel.lin@gmail.com> |
| Date: Sat, 17 Sep 2011 22:15:34 +0800 |
| Subject: ARM: pxa/cm-x300: properly set bt_reset pin |
| |
| From: Axel Lin <axel.lin@gmail.com> |
| |
| commit 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 upstream. |
| |
| Fix below build warning and properly set bt_reset pin. |
| |
| CC arch/arm/mach-pxa/cm-x300.o |
| arch/arm/mach-pxa/cm-x300.c: In function 'cm_x300_init_wi2wi': |
| arch/arm/mach-pxa/cm-x300.c:779: warning: unused variable 'wlan_en' |
| arch/arm/mach-pxa/cm-x300.c:795: warning: 'bt_reset' may be used uninitialized in this function |
| |
| Signed-off-by: Axel Lin <axel.lin@gmail.com> |
| Acked-by: Igor Grinberg <grinberg@compulab.co.il> |
| Signed-off-by: Eric Miao <eric.y.miao@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/arm/mach-pxa/cm-x300.c | 8 +++----- |
| 1 file changed, 3 insertions(+), 5 deletions(-) |
| |
| --- a/arch/arm/mach-pxa/cm-x300.c |
| +++ b/arch/arm/mach-pxa/cm-x300.c |
| @@ -775,7 +775,6 @@ static struct gpio cm_x300_wi2wi_gpios[] |
| |
| 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(vo |
| } |
| |
| 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 */ |
