From 6d740cc6c49a5dbd318993c2adf52691e513f23b Mon Sep 17 00:00:00 2001 From: Rene Herman Date: Wed, 26 Sep 2007 00:02:19 -0400 Subject: [PATCH] --- yaml --- r: 69374 b: refs/heads/master c: 1788180eec4a9444249b0cbe788b1fac6592976c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/ucb1400_ts.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dd2e7aa112f9..ca2a5c28bff8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f9d2827afab6a6ad82b657b1d7fe00cbffa65f8 +refs/heads/master: 1788180eec4a9444249b0cbe788b1fac6592976c diff --git a/trunk/drivers/input/touchscreen/ucb1400_ts.c b/trunk/drivers/input/touchscreen/ucb1400_ts.c index 36f944019158..86aed64ec0fb 100644 --- a/trunk/drivers/input/touchscreen/ucb1400_ts.c +++ b/trunk/drivers/input/touchscreen/ucb1400_ts.c @@ -130,8 +130,7 @@ static unsigned int ucb1400_adc_read(struct ucb1400 *ucb, u16 adc_channel) if (val & UCB_ADC_DAT_VALID) break; /* yield to other processes */ - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(1); + schedule_timeout_uninterruptible(1); } return UCB_ADC_DAT_VALUE(val);