diff --git a/[refs] b/[refs]
index ecf1e22499f4..58b028c36a01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1550bf2d59a5ab74c5c14f2e65ed83516ca7d74d
+refs/heads/master: a831b9132065e1aa18acd7910d5f9c164a2f350f
diff --git a/trunk/net/nfc/netlink.c b/trunk/net/nfc/netlink.c
index 03c31db38f12..99bc6f7faa7b 100644
--- a/trunk/net/nfc/netlink.c
+++ b/trunk/net/nfc/netlink.c
@@ -634,6 +634,15 @@ static int nfc_genl_stop_poll(struct sk_buff *skb, struct genl_info *info)
 	if (!dev)
 		return -ENODEV;
 
+	device_lock(&dev->dev);
+
+	if (!dev->polling) {
+		device_unlock(&dev->dev);
+		return -EINVAL;
+	}
+
+	device_unlock(&dev->dev);
+
 	mutex_lock(&dev->genl_data.genl_data_mutex);
 
 	if (dev->genl_data.poll_req_pid != info->snd_pid) {