Commit 2eff7c79 authored by John W. Linville's avatar John W. Linville

Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes

Samuel Ortiz <sameo@linux.intel.com> says:

"This is the first NFC fixes pull request for 3.13.

It only contains one fix for a regression introduced with commit
e29a9e2a. Without this fix, we can not establish a p2p link in
target mode. Only initiator mode works."
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents e46316c8 d31652a2
...@@ -384,7 +384,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, ...@@ -384,7 +384,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
{ {
dev->dep_link_up = true; dev->dep_link_up = true;
if (!dev->active_target) { if (!dev->active_target && rf_mode == NFC_RF_INITIATOR) {
struct nfc_target *target; struct nfc_target *target;
target = nfc_find_target(dev, target_idx); target = nfc_find_target(dev, target_idx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment