← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to drivers/net/wireless/wl12xx/sdio_test.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/wl12xx/sdio_test.c
30
30
#include <linux/mmc/sdio_func.h>
31
31
#include <linux/mmc/sdio_ids.h>
32
32
#include <linux/mmc/card.h>
 
33
#include <linux/mmc/host.h>
33
34
#include <linux/gpio.h>
34
35
#include <linux/wl12xx.h>
35
36
#include <linux/kthread.h>
142
143
                ret = pm_runtime_get_sync(&func->dev);
143
144
                if (ret < 0)
144
145
                        goto out;
 
146
 
 
147
                /* Runtime PM might be disabled, power up the card manually */
 
148
                ret = mmc_power_restore_host(func->card->host);
 
149
                if (ret < 0)
 
150
                        goto out;
 
151
 
145
152
                sdio_claim_host(func);
146
153
                sdio_enable_func(func);
147
 
                sdio_release_host(func);
148
154
        } else {
149
 
                sdio_claim_host(func);
150
155
                sdio_disable_func(func);
151
156
                sdio_release_host(func);
152
157
 
 
158
                /* Runtime PM might be disabled, power off the card manually */
 
159
                ret = mmc_power_save_host(func->card->host);
 
160
                if (ret < 0)
 
161
                        goto out;
 
162
 
153
163
                /* Power down the card */
154
164
                ret = pm_runtime_put_sync(&func->dev);
155
165
        }
193
203
                ret = request_firmware(&fw, WL128X_FW_NAME,
194
204
                                       wl1271_wl_to_dev(wl));
195
205
        else
196
 
                ret = request_firmware(&fw, WL1271_FW_NAME,
 
206
                ret = request_firmware(&fw, WL127X_FW_NAME,
197
207
                                       wl1271_wl_to_dev(wl));
198
208
 
199
209
        if (ret < 0) {
433
443
 
434
444
        sdio_set_drvdata(func, wl_test);
435
445
 
436
 
 
437
446
        /* power up the device */
438
447
        ret = wl1271_chip_wakeup(wl);
439
448
        if (ret) {