diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-14 17:37:09 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-14 17:42:42 -0500 |
| commit | 0a379e21c503b2ff66b44d588df9f231e9b0b9ca (patch) | |
| tree | 22b875fcf4b67fcd007726f00c5fc1748ce985d0 /net/nfc | |
| parent | a49da8811e71c5355b52c65ee32976741d5834cd (diff) | |
| parent | fdc3452cd2c7b2bfe0f378f92123f4f9a98fa2bd (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/nfc')
| -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 02ab34132157..b675fa4a6f19 100644 --- a/net/nfc/core.c +++ b/net/nfc/core.c | |||
| @@ -382,7 +382,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, | |||
| 382 | { | 382 | { |
| 383 | dev->dep_link_up = true; | 383 | dev->dep_link_up = true; |
| 384 | 384 | ||
| 385 | if (!dev->active_target) { | 385 | if (!dev->active_target && rf_mode == NFC_RF_INITIATOR) { |
| 386 | struct nfc_target *target; | 386 | struct nfc_target *target; |
| 387 | 387 | ||
| 388 | target = nfc_find_target(dev, target_idx); | 388 | target = nfc_find_target(dev, target_idx); |