git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
drivers
/
input
/
touchscreen
/
ucb1400_ts.c
diff --git
a/drivers/input/touchscreen/ucb1400_ts.c
b/drivers/input/touchscreen/ucb1400_ts.c
index
f100c7f
..
6954f55
100644
(file)
--- a/
drivers/input/touchscreen/ucb1400_ts.c
+++ b/
drivers/input/touchscreen/ucb1400_ts.c
@@
-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) {
/*