X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Finput%2Finput.c;h=846ccdd905b19b66872762fd05db29ea0552a8cb;hb=42249094f79422fbf5ed4b54eeb48ff096809b8f;hp=e75d015024a15c7fb6eb3074299e234a69916594;hpb=936816161978ca716a56c5e553c68f25972b1e3a;p=~andy%2Flinux diff --git a/drivers/input/input.c b/drivers/input/input.c index e75d015024a..846ccdd905b 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -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;