From fc0b980537fe0055ea7c4abdbd9a9f6b9e00ee0a Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Wed, 14 Dec 2011 16:43:07 +0100 Subject: [PATCH] --- yaml --- r: 278961 b: refs/heads/master c: 94a098da42f258ae7019acbbea3bc5f93dc6f8f1 h: refs/heads/master i: 278959: 6297f8b9059b984b1280817a6a3a332b78f18e71 v: v3 --- [refs] | 2 +- trunk/net/nfc/netlink.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e3ada8da1454..a6ff1394be52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c7cd3bfec68fee33b30d177df6a6a0c4bbdc59d +refs/heads/master: 94a098da42f258ae7019acbbea3bc5f93dc6f8f1 diff --git a/trunk/net/nfc/netlink.c b/trunk/net/nfc/netlink.c index 061711f47476..1d76d38c4a24 100644 --- a/trunk/net/nfc/netlink.c +++ b/trunk/net/nfc/netlink.c @@ -504,12 +504,10 @@ static int nfc_genl_rcv_nl_event(struct notifier_block *this, dev = nfc_device_iter_next(&iter); while (dev) { - mutex_lock(&dev->genl_data.genl_data_mutex); if (dev->genl_data.poll_req_pid == n->pid) { nfc_stop_poll(dev); dev->genl_data.poll_req_pid = 0; } - mutex_unlock(&dev->genl_data.genl_data_mutex); dev = nfc_device_iter_next(&iter); }