From 90e74b2dd48bf58539f71bed8ab84b8cfbdfe5ef Mon Sep 17 00:00:00 2001 From: Rebecca Schultz Zavin Date: Sun, 29 Mar 2009 22:10:22 -0700 Subject: 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 Signed-off-by: Arve Hjønnevåg --- drivers/input/touchscreen/synaptics_i2c_rmi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers/input') diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics_i2c_rmi.c index e003e42b6026..f37c0c0fba4d 100644 --- a/drivers/input/touchscreen/synaptics_i2c_rmi.c +++ b/drivers/input/touchscreen/synaptics_i2c_rmi.c @@ -265,6 +265,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; @@ -344,6 +345,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; @@ -361,6 +363,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; @@ -512,7 +515,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) -- cgit v1.2.3