[PATCH] usb1400_ts: fix access to "device data" in resume function

[PATCH] usb1400_ts: fix access to "device data" in resume function

[Sebastian Andrzej Siewior]

From: Manuel Traut <manut@linutronix.de>

platform_data != driver_data

driver data is actually the "correct" place of the struct however it is
not placed there due to the need of the ac97 struct. This is broken since
d9105c2b01 aka "[ARM] 5184/1: Split ucb1400_ts into core and touchscreen"

Signed-off-by: Manuel Traut <manut@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
This is suspend/resume tested.
What happend actually to [0]? It is not merged.

[0] http://markmail.org/message/cp5koxmiotxrf4xl

 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 1647bc4..a42226e 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -418,7 +418,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) {
 		/*
-- 
1.6.0.6

Re: [PATCH] usb1400_ts: fix access to "device data" in resume function

[Dmitry Torokhov]

On Tue, May 26, 2009 at 07:04:40PM +0200, Sebastian Andrzej Siewior wrote:
> From: Manuel Traut <manut@linutronix.de>
> 
> platform_data != driver_data
> 
> driver data is actually the "correct" place of the struct however it is
> not placed there due to the need of the ac97 struct. This is broken since
> d9105c2b01 aka "[ARM] 5184/1: Split ucb1400_ts into core and touchscreen"
> 
> Signed-off-by: Manuel Traut <manut@linutronix.de>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

Applied, to 'for-linus' branch, thank you Sebastian.

> ---
> This is suspend/resume tested.
> What happend actually to [0]? It is not merged.
> 
> [0] http://markmail.org/message/cp5koxmiotxrf4xl

Just applied it to my 'next' branch.

-- 
Dmitry