diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-01-13 13:35:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-01-13 13:35:28 +0100 |
commit | 56b4811039174bba9cbd68318d0d8b1585b9eded (patch) | |
tree | f3e8f99e85e545662d82e18bef2a7009c2948852 /net/nfc/core.c | |
parent | e777b63bbd589248eb151a3191ee92331a701385 (diff) | |
parent | 9722c2dac708e9468cc0dc30218ef76946ffbc9d (diff) | |
download | op-kernel-dev-56b4811039174bba9cbd68318d0d8b1585b9eded.zip op-kernel-dev-56b4811039174bba9cbd68318d0d8b1585b9eded.tar.gz |
Merge branch 'sched/urgent' into sched/core
Pick up the latest fixes before applying new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/nfc/core.c')
-rw-r--r-- | net/nfc/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c index 8725291..83b9927 100644 --- a/net/nfc/core.c +++ b/net/nfc/core.c @@ -384,7 +384,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, { dev->dep_link_up = true; - if (!dev->active_target) { + if (!dev->active_target && rf_mode == NFC_RF_INITIATOR) { struct nfc_target *target; target = nfc_find_target(dev, target_idx); |