diff options
Diffstat (limited to 'net/nfc/netlink.c')
-rw-r--r-- | net/nfc/netlink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index f1829f6ae9c5..581d419083aa 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c | |||
@@ -33,7 +33,7 @@ static struct genl_multicast_group nfc_genl_event_mcgrp = { | |||
33 | .name = NFC_GENL_MCAST_EVENT_NAME, | 33 | .name = NFC_GENL_MCAST_EVENT_NAME, |
34 | }; | 34 | }; |
35 | 35 | ||
36 | struct genl_family nfc_genl_family = { | 36 | static struct genl_family nfc_genl_family = { |
37 | .id = GENL_ID_GENERATE, | 37 | .id = GENL_ID_GENERATE, |
38 | .hdrsize = 0, | 38 | .hdrsize = 0, |
39 | .name = NFC_GENL_NAME, | 39 | .name = NFC_GENL_NAME, |
@@ -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 | ||