From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 28 Sep 2012 15:11:16 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c487606f835a93a725bac1aefd536be98f22474d;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	net/nfc/netlink.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

c487606f835a93a725bac1aefd536be98f22474d
diff --cc net/nfc/netlink.c
index 4bbb70e32d1e,baa6af9500df..c1b5285cbde7
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@@ -761,31 -761,63 +761,63 @@@ static struct genl_ops nfc_genl_ops[] 
  	},
  };
  
- static int nfc_genl_rcv_nl_event(struct notifier_block *this,
- 				 unsigned long event, void *ptr)
+ 
+ struct urelease_work {
+ 	struct	work_struct w;
 -	int	pid;
++	int	portid;
+ };
+ 
+ static void nfc_urelease_event_work(struct work_struct *work)
  {
- 	struct netlink_notify *n = ptr;
+ 	struct urelease_work *w = container_of(work, struct urelease_work, w);
  	struct class_dev_iter iter;
  	struct nfc_dev *dev;
  
- 	if (event != NETLINK_URELEASE || n->protocol != NETLINK_GENERIC)
- 		goto out;
 -	pr_debug("pid %d\n", w->pid);
++	pr_debug("portid %d\n", w->portid);
  
- 	pr_debug("NETLINK_URELEASE event from id %d\n", n->portid);
+ 	mutex_lock(&nfc_devlist_mutex);
  
  	nfc_device_iter_init(&iter);
  	dev = nfc_device_iter_next(&iter);
  
  	while (dev) {
- 		if (dev->genl_data.poll_req_portid == n->portid) {
+ 		mutex_lock(&dev->genl_data.genl_data_mutex);
+ 
 -		if (dev->genl_data.poll_req_pid == w->pid) {
++		if (dev->genl_data.poll_req_portid == w->portid) {
  			nfc_stop_poll(dev);
 -			dev->genl_data.poll_req_pid = 0;
 +			dev->genl_data.poll_req_portid = 0;
  		}
+ 
+ 		mutex_unlock(&dev->genl_data.genl_data_mutex);
+ 
  		dev = nfc_device_iter_next(&iter);
  	}
  
  	nfc_device_iter_exit(&iter);
  
+ 	mutex_unlock(&nfc_devlist_mutex);
+ 
+ 	kfree(w);
+ }
+ 
+ static int nfc_genl_rcv_nl_event(struct notifier_block *this,
+ 				 unsigned long event, void *ptr)
+ {
+ 	struct netlink_notify *n = ptr;
+ 	struct urelease_work *w;
+ 
+ 	if (event != NETLINK_URELEASE || n->protocol != NETLINK_GENERIC)
+ 		goto out;
+ 
 -	pr_debug("NETLINK_URELEASE event from id %d\n", n->pid);
++	pr_debug("NETLINK_URELEASE event from id %d\n", n->portid);
+ 
+ 	w = kmalloc(sizeof(*w), GFP_ATOMIC);
+ 	if (w) {
+ 		INIT_WORK((struct work_struct *) w, nfc_urelease_event_work);
 -		w->pid = n->pid;
++		w->portid = n->portid;
+ 		schedule_work((struct work_struct *) w);
+ 	}
+ 
  out:
  	return NOTIFY_DONE;
  }