diff options
| author | Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> | 2011-09-02 15:59:16 +0530 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:01:14 +0100 |
| commit | 611a7ed1d4ca96e7f72b3629f1a56ec53051f5a3 (patch) | |
| tree | b8ce3ff8df4cbaa2719f3c13d321e278640a2665 /drivers/staging/cg2900/devices-cg2900.c | |
| parent | b10dbaf867df6b543a8a55338cdd22dc8f8517b9 (diff) | |
cg2900: Set WLAN_PMU_EN for startup
This patch changes startup behavior of CG2900 so that
WLAN_PMU_EN is controlled separately.
ST-Ericsson Linux next: Not tested, ER 326583
ST-Ericsson ID: 326583
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Iac4aac30835b93c16ceaaf2aa0e601b293cc0cbb
Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23839
Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com>
Reviewed-by: QATEST
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30040
Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
Diffstat (limited to 'drivers/staging/cg2900/devices-cg2900.c')
| -rw-r--r-- | drivers/staging/cg2900/devices-cg2900.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/cg2900/devices-cg2900.c b/drivers/staging/cg2900/devices-cg2900.c index 689235989d9..8f342a4a1fc 100644 --- a/drivers/staging/cg2900/devices-cg2900.c +++ b/drivers/staging/cg2900/devices-cg2900.c @@ -149,10 +149,12 @@ static int dcg2900_init(struct cg2900_chip_dev *dev) return -ENOMEM; } + info->gbf_gpio = -1; + info->pmuen_gpio = -1; + info->bt_gpio = -1; + if (!dev->pdev->num_resources) { dev_dbg(dev->dev, "No resources available\n"); - info->gbf_gpio = -1; - info->bt_gpio = -1; goto finished; } @@ -218,6 +220,8 @@ static void dcg2900_exit(struct cg2900_chip_dev *dev) dcg2900_disable_chip(dev); if (info->bt_gpio != -1) gpio_free(info->bt_gpio); + if (info->pmuen_gpio != -1) + gpio_free(info->pmuen_gpio); if (info->gbf_gpio != -1) gpio_free(info->gbf_gpio); kfree(info); |