Hi John, This pull request replaces the one from 2012-06-24. There were a couple of bugs in our SDIO changes that were fixed by Eyal. I also added two of my own patches, one to deprecate unsupported (sample) HW and one to fix a couple of bugs in the exit path of our probe function. Here's what I wrote to the original pull request: ----8<---- One more pull request intended for 3.6. Mostly about SDIO error handling (by Ido) and correct handling and recovery during suspend/resume. Plus one new debugfs entry that allows easier FW debugging, by Arkady. ----8<---- Please pull or let me know if there's any problem. The following changes since commit 6bcfe67f9865fb51ec78fc9b09887375db7e08b5: ath9k_htc: Fix IDLE power save (2012-06-26 14:28:52 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git for-linville for you to fetch changes up to a572ac1a3d37440dc9daf69f9ad63243bef6893f: Merge branch 'wl12xx-next' into for-linville (2012-06-26 22:43:29 +0300) ---------------------------------------------------------------- Arik Nemtsov (6): wlcore: cancel suspend when recovery is pending wlcore: don't allow SDIO read/writes after failure wlcore: force recovery on resume if suspended without recovering wlcore: check Rx-filter functions in the suspend path wlcore: refactor threaded IRQ routine wlcore: prevent recovery in the middle of resume Arkady Miasnikov (1): wlcore: access the firmware memory via debugfs Eyal Shapira (3): wlcore: fix broken TX due to wrong queuing of recovery wlcore: queue recovery in case of bus errors during cmd_remove_peer wlcore: print stack trace in every recovery Ido Yariv (11): wlcore: Fix sdio out-of-sync power state wlcore: Disable interrupts while recovering wlcore: Change read/write ops to return errors wlcore: Change raw io functions to return errors wlcore: Propagate errors from wlcore_raw_*_data functions wlcore: Propagate errors from wl1271_read wlcore: Propagate errors from wl1271_write wlcore: Propagate errors from wl1271_raw_read32 wlcore: Propagate errors from wl1271_raw_write32 wlcore: Propagate errors from wl1271_read_hwaddr wlcore: Force checking of io functions' return values Luciano Coelho (3): wl18xx: deprecate PG1 support wlcore: fix some failure cases in wlcore_probe() Merge branch 'wl12xx-next' into for-linville drivers/net/wireless/ti/wl12xx/main.c | 343 ++++++++++++++++++++++++++++++++++++++++++++---------------- drivers/net/wireless/ti/wl18xx/acx.h | 34 +++--- drivers/net/wireless/ti/wl18xx/io.c | 39 ++++--- drivers/net/wireless/ti/wl18xx/io.h | 4 +- drivers/net/wireless/ti/wl18xx/main.c | 260 ++++++++++++++++++++++++++++----------------- drivers/net/wireless/ti/wlcore/boot.c | 84 ++++++++++----- drivers/net/wireless/ti/wlcore/cmd.c | 77 ++++++++++---- drivers/net/wireless/ti/wlcore/debugfs.c | 192 ++++++++++++++++++++++++++++++++++ drivers/net/wireless/ti/wlcore/event.c | 15 ++- drivers/net/wireless/ti/wlcore/hw_ops.h | 12 ++- drivers/net/wireless/ti/wlcore/io.c | 55 +++++++--- drivers/net/wireless/ti/wlcore/io.h | 144 ++++++++++++++++--------- drivers/net/wireless/ti/wlcore/main.c | 251 +++++++++++++++++++++++++++++++++----------- drivers/net/wireless/ti/wlcore/ps.c | 14 ++- drivers/net/wireless/ti/wlcore/rx.c | 37 +++++-- drivers/net/wireless/ti/wlcore/rx.h | 4 +- drivers/net/wireless/ti/wlcore/sdio.c | 50 +++++---- drivers/net/wireless/ti/wlcore/spi.c | 14 ++- drivers/net/wireless/ti/wlcore/tx.c | 76 ++++++++++---- drivers/net/wireless/ti/wlcore/tx.h | 4 +- drivers/net/wireless/ti/wlcore/wlcore.h | 14 +-- drivers/net/wireless/ti/wlcore/wlcore_i.h | 9 +- 22 files changed, 1257 insertions(+), 475 deletions(-) -- Cheers, Luca.
Attachment:
signature.asc
Description: This is a digitally signed message part