Skip to contentSkip to conversation

usb1400_ts: fix access to "device data" in resume function

PATCH Applied Sebastian Andrzej Siewior 2 participants 2 messages May 26, 2009 – May 27, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb1400_ts: fix access to "device data" in resume function

From: Manuel Traut <[email protected]>

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"

---
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(-)
drivers/input/touchscreen/ucb1400_ts.c +1 -1
index 1647bc4..a42226e 100644
@@ -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) {
 		/*
Signature · 1 line
1.6.0.6
maintainer Applied
#1 lore raw
Quoted 10 lines · Sebastian Andrzej Siewior

From: Manuel Traut <[email protected]>

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"

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

Quoted 5 lines

---
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.

Signature · 1 line
Dmitry