aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDaniel Kurtz <djkurtz@chromium.org>2012-06-28 09:08:04 -0400
committerHenrik Rydberg <rydberg@euromail.se>2012-06-29 09:58:02 -0400
commite1e1658d2eeb06e09f9855bdf6edb93474eca0c0 (patch)
tree79628a61875c4c0fc29a8878bfd886e45df87111 /drivers/input
parentc2ef9a1a248bc597f3275e8d52e8ad68416d039f (diff)
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 <djkurtz@chromium.org> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 8b33f3ae4eba..926209cba77d 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,
1136 0, 255, 0, 0); 1136 0, 255, 0, 0);
1137 1137
1138 /* For multi touch */ 1138 /* For multi touch */
1139 input_mt_init_slots(input_dev, MXT_MAX_FINGER); 1139 error = input_mt_init_slots(input_dev, MXT_MAX_FINGER);
1140 if (error)
1141 goto err_free_mem;
1140 input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 1142 input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
1141 0, MXT_MAX_AREA, 0, 0); 1143 0, MXT_MAX_AREA, 0, 0);
1142 input_set_abs_params(input_dev, ABS_MT_POSITION_X, 1144 input_set_abs_params(input_dev, ABS_MT_POSITION_X,