From 8226e2b349727671352e7ffa003c7951355867b4 Mon Sep 17 00:00:00 2001 From: Manuel Traut Date: Wed, 27 May 2009 06:20:05 -0700 Subject: [PATCH] --- yaml --- r: 145364 b: refs/heads/master c: 346a850e3c3a20159cef2b79235e6d34aa497c65 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/ucb1400_ts.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8b673f430076..43302a7a116a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9fcfc3b4627a1ec9b50411060f1b384926d6610 +refs/heads/master: 346a850e3c3a20159cef2b79235e6d34aa497c65 diff --git a/trunk/drivers/input/touchscreen/ucb1400_ts.c b/trunk/drivers/input/touchscreen/ucb1400_ts.c index f100c7f4c1db..6954f5500108 100644 --- a/trunk/drivers/input/touchscreen/ucb1400_ts.c +++ b/trunk/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) { /*