diff options
| author | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /drivers/input/touchscreen/ucb1400_ts.c | |
| parent | 04288f42033607099cebf5ca15ce8dcec3a9688b (diff) | |
| parent | 3af968e066d593bc4dacc021715f3e95ddf0996f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/input/touchscreen/ucb1400_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/ucb1400_ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index f100c7f4c1db..6954f5500108 100644 --- 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) | |||
| 419 | #ifdef CONFIG_PM | 419 | #ifdef CONFIG_PM |
| 420 | static int ucb1400_ts_resume(struct platform_device *dev) | 420 | static int ucb1400_ts_resume(struct platform_device *dev) |
| 421 | { | 421 | { |
| 422 | struct ucb1400_ts *ucb = platform_get_drvdata(dev); | 422 | struct ucb1400_ts *ucb = dev->dev.platform_data; |
| 423 | 423 | ||
| 424 | if (ucb->ts_task) { | 424 | if (ucb->ts_task) { |
| 425 | /* | 425 | /* |