From 7f4d897d096fd04ccdfc4a6761e3643cf1a4b106 Mon Sep 17 00:00:00 2001 From: Matt Mackall Date: Sun, 25 Jun 2006 05:47:13 -0700 Subject: [PATCH] --- yaml --- r: 29663 b: refs/heads/master c: 6ceab8a936c302c0cea2bfe55617c76e2f5746fa h: refs/heads/master i: 29661: 27c184fa0a84012ec7aeef279adc8207f6238db0 29659: b6cee4dbe3aa5606c0c85682173623ca511748b2 29655: 1eba007e52dcb06f6adfd78c647eb5df7df9a336 29647: bd7b6b70c2aa5a8a7fc73c2555ff2f9eed8d403d 29631: 27b7e3a0539887fabc9e17c906537865f76fbada v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/ads7846.c | 3 +-- trunk/drivers/input/touchscreen/h3600_ts_input.c | 6 ++---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9a0dc0e15d59..da704d28148e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f41a53a6699209216327cd4b506711610ad24c5 +refs/heads/master: 6ceab8a936c302c0cea2bfe55617c76e2f5746fa diff --git a/trunk/drivers/input/touchscreen/ads7846.c b/trunk/drivers/input/touchscreen/ads7846.c index 161afddd0f44..386023c594d7 100644 --- a/trunk/drivers/input/touchscreen/ads7846.c +++ b/trunk/drivers/input/touchscreen/ads7846.c @@ -773,8 +773,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) ts->last_msg = m; - if (request_irq(spi->irq, ads7846_irq, - SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING, + if (request_irq(spi->irq, ads7846_irq, SA_TRIGGER_FALLING, spi->dev.driver->name, ts)) { dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); err = -EBUSY; diff --git a/trunk/drivers/input/touchscreen/h3600_ts_input.c b/trunk/drivers/input/touchscreen/h3600_ts_input.c index a18d56bdafd9..a595d386312f 100644 --- a/trunk/drivers/input/touchscreen/h3600_ts_input.c +++ b/trunk/drivers/input/touchscreen/h3600_ts_input.c @@ -399,16 +399,14 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv) set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE); if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler, - SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM, - "h3600_action", &ts->dev)) { + SA_SHIRQ | SA_INTERRUPT, "h3600_action", &ts->dev)) { printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n"); err = -EBUSY; goto fail2; } if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler, - SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM, - "h3600_suspend", &ts->dev)) { + SA_SHIRQ | SA_INTERRUPT, "h3600_suspend", &ts->dev)) { printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n"); err = -EBUSY; goto fail3;