From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 10 Dec 2013 04:23:21 +0000 (+0800)
Subject: Merge tag 'v3.10.23' into develop-3.10
X-Git-Tag: firefly_0821_release~6453
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aea1f7c03c2a14f4c1a3f75e5c1bf8752ec66f13;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.10.23' into develop-3.10

This is the 3.10.23 stable release

Conflicts:
	drivers/input/evdev.c
---

aea1f7c03c2a14f4c1a3f75e5c1bf8752ec66f13
diff --cc drivers/input/evdev.c
index 23425d7922ca,c122dd2adc22..f4897c8c1500
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@@ -297,9 -291,11 +299,13 @@@ static int evdev_release(struct inode *
  	mutex_unlock(&evdev->mutex);
  
  	evdev_detach_client(evdev, client);
 +	if (client->use_wake_lock)
 +		wake_lock_destroy(&client->wake_lock);
- 	kfree(client);
+ 
+ 	if (is_vmalloc_addr(client))
+ 		vfree(client);
+ 	else
+ 		kfree(client);
  
  	evdev_close_device(evdev);