xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' into for-linus

Browse Source 
Merge first round of changes for 3.13 merge window.
This commit is contained in:
Dmitry Torokhov
2013-11-14 17:38:05 -08:00
parent 9368161619 2c027b7c48
commit 42249094f7
14124 changed files with 1291570 additions and 518870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/input.c
View File

@@ -2052,7 +2052,7 @@ int input_register_device(struct input_dev *dev)
if (dev->hint_events_per_packet < packet_size)
dev->hint_events_per_packet = packet_size;
dev->max_vals = max(dev->hint_events_per_packet, packet_size) + 2;
dev->max_vals = dev->hint_events_per_packet + 2;
dev->vals = kcalloc(dev->max_vals, sizeof(*dev->vals), GFP_KERNEL);
if (!dev->vals) {
error = -ENOMEM;