On Thu, Oct 31, 2013 at 03:26:34PM +0800, Kang Hu wrote: > dev->hint_events_per_packet is guaranteed to be >= packet_size. > so an extra max() call is not needed. Applied, thank you. > > Signed-off-by: Kang Hu <hukangustc@xxxxxxxxx> > --- > drivers/input/input.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/input/input.c b/drivers/input/input.c > index c044699..fb513da 100644 > --- a/drivers/input/input.c > +++ b/drivers/input/input.c > @@ -2048,7 +2048,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; > -- > 1.8.3.1 > -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html