diff options
author | Eric Lapuyade <eric.lapuyade@intel.com> | 2012-05-07 06:31:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-05-15 17:28:00 -0400 |
commit | d4ccb132801aeeb2cfd18c4b4b7fa0043ab37f80 (patch) | |
tree | 7f3372d3925e5cb69cb5db5867accee4d17ff9b8 /net/nfc/netlink.c | |
parent | addfabf98daad7b469ad788a622dbeab6aaaa330 (diff) |
NFC: Specify usage for targets found and target lost events
It is now specified that nfc_target_found() and nfc_target_lost() core
functions must not be called from an atomic context. This allow us to
serialize calls and protect the targets table using the nfc device lock
instead of a spinlock.
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc/netlink.c')
-rw-r--r-- | net/nfc/netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index f1829f6ae9c5..77dae74832d3 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c | |||
@@ -128,7 +128,7 @@ static int nfc_genl_dump_targets(struct sk_buff *skb, | |||
128 | cb->args[1] = (long) dev; | 128 | cb->args[1] = (long) dev; |
129 | } | 129 | } |
130 | 130 | ||
131 | spin_lock_bh(&dev->targets_lock); | 131 | device_lock(&dev->dev); |
132 | 132 | ||
133 | cb->seq = dev->targets_generation; | 133 | cb->seq = dev->targets_generation; |
134 | 134 | ||
@@ -141,7 +141,7 @@ static int nfc_genl_dump_targets(struct sk_buff *skb, | |||
141 | i++; | 141 | i++; |
142 | } | 142 | } |
143 | 143 | ||
144 | spin_unlock_bh(&dev->targets_lock); | 144 | device_unlock(&dev->dev); |
145 | 145 | ||
146 | cb->args[0] = i; | 146 | cb->args[0] = i; |
147 | 147 | ||