From 847af32f63dc6fafa58348d9c37bfcba6b4e83e4 Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Thu, 28 Jun 2012 21:08:04 +0800 Subject: [PATCH] --- yaml --- r: 318291 b: refs/heads/master c: e1e1658d2eeb06e09f9855bdf6edb93474eca0c0 h: refs/heads/master i: 318289: cffb9355c6679005bc0baa2b8272e6ea2ffd9458 318287: 65dae6d23e671dc6e28aff1c548e23d7d46e0d3b v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/atmel_mxt_ts.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7124ea7f6a48..9a1a4b0e0398 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2ef9a1a248bc597f3275e8d52e8ad68416d039f +refs/heads/master: e1e1658d2eeb06e09f9855bdf6edb93474eca0c0 diff --git a/trunk/drivers/input/touchscreen/atmel_mxt_ts.c b/trunk/drivers/input/touchscreen/atmel_mxt_ts.c index 8b33f3ae4eba..926209cba77d 100644 --- a/trunk/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/trunk/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,