diff options
| author | John W. Linville | 2013-05-22 20:23:05 +0200 |
|---|---|---|
| committer | John W. Linville | 2013-05-22 20:23:05 +0200 |
| commit | 323a98db4d51e4fefc74290adfb5493047cbbe22 (patch) | |
| tree | b084691065908513b0695d0d404edd11d9357f63 /drivers/net/wireless/atmel.c | |
| parent | ath9k: fix draining aggregation tid buffers (diff) | |
| parent | NFC: mei: Do not disable MEI devices from their remove routine (diff) | |
| download | kernel-qcow2-linux-323a98db4d51e4fefc74290adfb5493047cbbe22.tar.gz kernel-qcow2-linux-323a98db4d51e4fefc74290adfb5493047cbbe22.tar.xz kernel-qcow2-linux-323a98db4d51e4fefc74290adfb5493047cbbe22.zip | |
Samuel Ortiz <sameo@linux.intel.com> says:
"Merge tag 'nfc-fixes-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes
This is the first batch of NFC fixes for 3.10, and it contains:
- 3 fixes for the NFC MEI support:
* We now depend on the correct Kconfig symbol.
* We register an MEI event callback whenever we enable an NFC device,
otherwise we fail to read anything after an enable/disable cycle.
* We only disable an MEI device from its disable mey_phy_ops,
preventing useless consecutive disable calls.
- An NFC Makefile cleanup, as I forgot to remove a commented out line when
moving the LLCP code to the NFC top level directory."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/atmel.c')
0 files changed, 0 insertions, 0 deletions