From: Daniel Kurtz Date: Thu, 28 Jun 2012 13:08:04 +0000 (+0800) Subject: Input: atmel_mxt_ts - detect OOM when creating mt slots X-Git-Tag: v3.6-rc1~95^2^2~13^2~22 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e1e1658d2eeb06e09f9855bdf6edb93474eca0c0;p=~emulex%2Finfiniband.git Input: atmel_mxt_ts - detect OOM when creating mt slots Hopefully this new code path will never be used, but better safe than sorry... Signed-off-by: Daniel Kurtz Signed-off-by: Henrik Rydberg --- diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 8b33f3ae4eb..926209cba77 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -1136,7 +1136,9 @@ static int __devinit mxt_probe(struct i2c_client *client, 0, 255, 0, 0); /* For multi touch */ - input_mt_init_slots(input_dev, MXT_MAX_FINGER); + error = input_mt_init_slots(input_dev, MXT_MAX_FINGER); + if (error) + goto err_free_mem; input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, MXT_MAX_AREA, 0, 0); input_set_abs_params(input_dev, ABS_MT_POSITION_X,