From 9c4ff8f0e9382205e77ad4fd8b7ca723f873dd82 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Gaddipati Date: Mon, 17 Jan 2011 20:40:58 -0800 Subject: [PATCH] --- yaml --- r: 232423 b: refs/heads/master c: d2763b4f44e16f44cc4156c9591e74df9dcd88be h: refs/heads/master i: 232421: 25610b8280443d164915e9d16c1cb334fb52a259 232419: 2f38cfe4b578a4f84f5fcd4be6046bf16fc5b50f 232415: c64e2623f1a632b0b93dd5c08094100ae1b08411 v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/bu21013_ts.c | 4 ++-- trunk/include/linux/input/bu21013.h | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 56550985fd82..aa9e679ed818 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba555461833aa1b5083004492ba97c92d5fccf46 +refs/heads/master: d2763b4f44e16f44cc4156c9591e74df9dcd88be diff --git a/trunk/drivers/input/touchscreen/bu21013_ts.c b/trunk/drivers/input/touchscreen/bu21013_ts.c index f7fa9ef4cd65..3c7e60b2f778 100644 --- a/trunk/drivers/input/touchscreen/bu21013_ts.c +++ b/trunk/drivers/input/touchscreen/bu21013_ts.c @@ -485,9 +485,9 @@ static int __devinit bu21013_probe(struct i2c_client *client, __set_bit(EV_ABS, in_dev->evbit); input_set_abs_params(in_dev, ABS_MT_POSITION_X, 0, - pdata->x_max_res, 0, 0); + pdata->touch_x_max, 0, 0); input_set_abs_params(in_dev, ABS_MT_POSITION_Y, 0, - pdata->y_max_res, 0, 0); + pdata->touch_y_max, 0, 0); input_set_drvdata(in_dev, bu21013_data); error = request_threaded_irq(pdata->irq, NULL, bu21013_gpio_irq, diff --git a/trunk/include/linux/input/bu21013.h b/trunk/include/linux/input/bu21013.h index e470d387dd49..05e03284b92a 100644 --- a/trunk/include/linux/input/bu21013.h +++ b/trunk/include/linux/input/bu21013.h @@ -12,8 +12,6 @@ * @cs_en: pointer to the cs enable function * @cs_dis: pointer to the cs disable function * @irq_read_val: pointer to read the pen irq value function - * @x_max_res: xmax resolution - * @y_max_res: ymax resolution * @touch_x_max: touch x max * @touch_y_max: touch y max * @cs_pin: chip select pin @@ -29,8 +27,6 @@ struct bu21013_platform_device { int (*cs_en)(int reset_pin); int (*cs_dis)(int reset_pin); int (*irq_read_val)(void); - int x_max_res; - int y_max_res; int touch_x_max; int touch_y_max; unsigned int cs_pin;