From 56770afdc0cd71265bd59315263f0f696e9534e6 Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Mon, 4 Jul 2011 04:09:31 -0700 Subject: [PATCH] --- yaml --- r: 260477 b: refs/heads/master c: be741de16f1148ecf0fcdd1f438945c939e6ea38 h: refs/heads/master i: 260475: 3a77e9693ff49a4677e54620f8f217d10f255a83 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-cm-t35.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3fd955c5c1d9..7c42f396dad4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d12c2e2890e20e65fbaa4b6c5ddbaa66fb843308 +refs/heads/master: be741de16f1148ecf0fcdd1f438945c939e6ea38 diff --git a/trunk/arch/arm/mach-omap2/board-cm-t35.c b/trunk/arch/arm/mach-omap2/board-cm-t35.c index 3cede3f02ee2..9d585ca3941d 100644 --- a/trunk/arch/arm/mach-omap2/board-cm-t35.c +++ b/trunk/arch/arm/mach-omap2/board-cm-t35.c @@ -466,9 +466,9 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio, if (gpio_request_one(wlan_rst, GPIOF_OUT_INIT_HIGH, "WLAN RST") == 0) { gpio_export(wlan_rst, 0); udelay(10); - gpio_set_value(wlan_rst, 0); + gpio_set_value_cansleep(wlan_rst, 0); udelay(10); - gpio_set_value(wlan_rst, 1); + gpio_set_value_cansleep(wlan_rst, 1); } else { pr_err("CM-T35: could not obtain gpio for WiFi reset\n"); }