xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'v2.6.30' into next

Browse Source
This commit is contained in:
Dmitry Torokhov
2009-06-11 01:58:01 -07:00
parent 05e882f890 07a2039b8e
commit 4894e4aca8
836 changed files with 20551 additions and 5737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/input/touchscreen/tsc2007.c
View File

@@ -200,8 +200,9 @@ static int tsc2007_read_values(struct tsc2007 *tsc)
static enum hrtimer_restart tsc2007_timer(struct hrtimer *handle)
{
struct tsc2007 *ts = container_of(handle, struct tsc2007, timer);
unsigned long flags;
spin_lock_irq(&ts->lock);
spin_lock_irqsave(&ts->lock, flags);
if (unlikely(!ts->get_pendown_state() && ts->pendown)) {
struct input_dev *input = ts->input;
@@ -222,7 +223,7 @@ static enum hrtimer_restart tsc2007_timer(struct hrtimer *handle)
tsc2007_send_event(ts);
}
spin_unlock_irq(&ts->lock);
spin_unlock_irqrestore(&ts->lock, flags);
return HRTIMER_NORESTART;
}

2
drivers/input/touchscreen/ucb1400_ts.c
View File

@@ -419,7 +419,7 @@ static int ucb1400_ts_remove(struct platform_device *dev)
#ifdef CONFIG_PM
static int ucb1400_ts_resume(struct platform_device *dev)
{
struct ucb1400_ts *ucb = platform_get_drvdata(dev);
struct ucb1400_ts *ucb = dev->dev.platform_data;
if (ucb->ts_task) {
/*