Merge branch 'for-viro' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[linux-2.6-block.git] / drivers / input / touchscreen / wacom_w8001.c

diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index b6fc4bde79ded75430725f97f72d7a9c3bae2c6b..85e95725d0dfe08c4c38fa73097c51236514dff5 100644 (file)
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -518,13 +518,21 @@ static int w8001_setup_touch(struct w8001 *w8001, char *basename,
                w8001->pktlen = W8001_PKTLEN_TOUCH2FG;
 
                __set_bit(BTN_TOOL_DOUBLETAP, dev->keybit);
-               input_mt_init_slots(dev, 2, 0);
+               error = input_mt_init_slots(dev, 2, 0);
+               if (error) {
+                       dev_err(&w8001->serio->dev,
+                               "failed to initialize MT slots: %d\n", error);
+                       return error;
+               }
+
                input_set_abs_params(dev, ABS_MT_POSITION_X,
                                        0, touch.x, 0, 0);
                input_set_abs_params(dev, ABS_MT_POSITION_Y,
                                        0, touch.y, 0, 0);
                input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
                                        0, MT_TOOL_MAX, 0, 0);
+               input_abs_set_res(dev, ABS_MT_POSITION_X, touch.panel_res);
+               input_abs_set_res(dev, ABS_MT_POSITION_Y, touch.panel_res);
 
                strlcat(basename, " 2FG", basename_sz);
                if (w8001->max_pen_x && w8001->max_pen_y)