CHROMIUM: Input: atmel_mxt_ts - detect OOM when creating mt slots

Also fix an erroneous duplicate line introduced in a recent commit.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
BUG=chromium-os:27713
TEST=builds clean; device detected and configured as before

Change-Id: I8b0cadbaa0f95502888a0e2d000e69095f796391
Reviewed-on: https://gerrit.chromium.org/gerrit/20845
Commit-Ready: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index db3d953..b16968f 100644 (file)
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1202,7 +1202,6 @@ static int __devinit mxt_probe(struct i2c_client *client,
        input_dev->phys = client->adapter->name;
        input_dev->id.bustype = BUS_I2C;
        input_dev->dev.parent = &client->dev;
-       input_dev->dev.parent = &client->dev;
        input_dev->open = mxt_input_open;
        input_dev->close = mxt_input_close;
 
@@ -1240,7 +1239,9 @@ static int __devinit mxt_probe(struct i2c_client *client,
        input_abs_set_res(input_dev, ABS_Y, MXT_PIXELS_PER_MM);
 
        /* 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,