From: Mark Brown <broonie@linaro.org>
Date: Thu, 5 Dec 2013 10:16:50 +0000 (+0000)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~190
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a8eb5f1e4b10d8b7992ed0e6c0915687339201c3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts (add/add):
	drivers/input/evdev.c
---

a8eb5f1e4b10d8b7992ed0e6c0915687339201c3
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);