diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 08:11:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 08:11:43 -0700 |
| commit | 31f6e1bd3b58c9a67e5ea0c2d372fbf5fc9e326d (patch) | |
| tree | b0f75a9353f2e9a82c6839a4f507eeb40ffc5fc5 /drivers/mfd | |
| parent | ad9ddd66c6e8a79630a975ff0bb8d45a11abe630 (diff) | |
| parent | 230ffc8e348e7841b79fd7c659d16aa5d7ec8a69 (diff) | |
| download | linux-3.10-31f6e1bd3b58c9a67e5ea0c2d372fbf5fc9e326d.tar.gz linux-3.10-31f6e1bd3b58c9a67e5ea0c2d372fbf5fc9e326d.tar.bz2 linux-3.10-31f6e1bd3b58c9a67e5ea0c2d372fbf5fc9e326d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ads7846 - SPI_CPHA mode bugfix
Input: ads7846 - document that it handles tsc2046 too
Input: input-polldev - add module info
Input: ucb1x00-ts - remove commented out code
Input: ucb1400_ts - use sched_setscheduler()
Input: ALPS - force stream mode
Input: iforce - minor clean-ups
Input: iforce - fix force feedback not working
Input: adbhid - do not access input_dev->private directly
Input: logips2pp - add type 72 (PS/2 TrackMan Marble)
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/ucb1x00-ts.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index cb8c264eaff..7772bd1d92b 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c @@ -207,16 +207,7 @@ static int ucb1x00_thread(void *_ts) struct ucb1x00_ts *ts = _ts; struct task_struct *tsk = current; DECLARE_WAITQUEUE(wait, tsk); - int valid; - - /* - * We could run as a real-time thread. However, thus far - * this doesn't seem to be necessary. - */ -// tsk->policy = SCHED_FIFO; -// tsk->rt_priority = 1; - - valid = 0; + int valid = 0; add_wait_queue(&ts->irq_wait, &wait); while (!kthread_should_stop()) { |