diff options
| -rw-r--r-- | drivers/input/touchscreen/ads7846.c | 3 | ||||
| -rw-r--r-- | drivers/input/touchscreen/h3600_ts_input.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 161afddd0f44..386023c594d7 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c | |||
| @@ -773,8 +773,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) | |||
| 773 | 773 | ||
| 774 | ts->last_msg = m; | 774 | ts->last_msg = m; |
| 775 | 775 | ||
| 776 | if (request_irq(spi->irq, ads7846_irq, | 776 | if (request_irq(spi->irq, ads7846_irq, SA_TRIGGER_FALLING, |
| 777 | SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING, | ||
| 778 | spi->dev.driver->name, ts)) { | 777 | spi->dev.driver->name, ts)) { |
| 779 | dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); | 778 | dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); |
| 780 | err = -EBUSY; | 779 | err = -EBUSY; |
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c index a18d56bdafd9..a595d386312f 100644 --- a/drivers/input/touchscreen/h3600_ts_input.c +++ b/drivers/input/touchscreen/h3600_ts_input.c | |||
| @@ -399,16 +399,14 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv) | |||
| 399 | set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE); | 399 | set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE); |
| 400 | 400 | ||
| 401 | if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler, | 401 | if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler, |
| 402 | SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM, | 402 | SA_SHIRQ | SA_INTERRUPT, "h3600_action", &ts->dev)) { |
| 403 | "h3600_action", &ts->dev)) { | ||
| 404 | printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n"); | 403 | printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n"); |
| 405 | err = -EBUSY; | 404 | err = -EBUSY; |
| 406 | goto fail2; | 405 | goto fail2; |
| 407 | } | 406 | } |
| 408 | 407 | ||
| 409 | if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler, | 408 | if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler, |
| 410 | SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM, | 409 | SA_SHIRQ | SA_INTERRUPT, "h3600_suspend", &ts->dev)) { |
| 411 | "h3600_suspend", &ts->dev)) { | ||
| 412 | printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n"); | 410 | printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n"); |
| 413 | err = -EBUSY; | 411 | err = -EBUSY; |
| 414 | goto fail3; | 412 | goto fail3; |
