Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a64200e authored by Axel Lin's avatar Axel Lin Committed by Eric Miao
Browse files

ARM: pxa/cm-x300: properly set bt_reset pin



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: default avatarAxel Lin <axel.lin@gmail.com>
Cc: <stable@kernel.org>
Acked-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent c149f6c8
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -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 */