diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2011-12-13 01:19:38 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-01-09 10:46:20 +0800 |
| commit | 7647f440d5920a79478fc248ecccd97facaad761 (patch) | |
| tree | e18d9ccbe77d27aff8771fd2d5c8413381568f10 /drivers/input | |
| parent | 7f8da38b1debe5dbc1d2bd4c97774e2590f1c3f7 (diff) | |
Input: synaptics_i2c_rmi: Add irqflags to platform data struct to pass them to driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/synaptics_i2c_rmi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics_i2c_rmi.c index 65436f65a92..5729602cbb6 100644 --- a/drivers/input/touchscreen/synaptics_i2c_rmi.c +++ b/drivers/input/touchscreen/synaptics_i2c_rmi.c @@ -266,6 +266,7 @@ static int synaptics_ts_probe( uint16_t max_x, max_y; int fuzz_x, fuzz_y, fuzz_p, fuzz_w; struct synaptics_i2c_rmi_platform_data *pdata; + unsigned long irqflags; int inactive_area_left; int inactive_area_right; int inactive_area_top; @@ -345,6 +346,7 @@ static int synaptics_ts_probe( pdata++; ts->flags = pdata->flags; ts->sensitivity_adjust = pdata->sensitivity_adjust; + irqflags = pdata->irqflags; inactive_area_left = pdata->inactive_left; inactive_area_right = pdata->inactive_right; inactive_area_top = pdata->inactive_top; @@ -362,6 +364,7 @@ static int synaptics_ts_probe( fuzz_p = pdata->fuzz_p; fuzz_w = pdata->fuzz_w; } else { + irqflags = 0; inactive_area_left = 0; inactive_area_right = 0; inactive_area_top = 0; @@ -513,7 +516,7 @@ static int synaptics_ts_probe( goto err_input_register_device_failed; } if (client->irq) { - ret = request_irq(client->irq, synaptics_ts_irq_handler, 0, client->name, ts); + ret = request_irq(client->irq, synaptics_ts_irq_handler, irqflags, client->name, ts); if (ret == 0) { ret = i2c_smbus_write_byte_data(ts->client, 0xf1, 0x01); /* enable abs int */ if (ret) |