[PATCH] fix-pm-bt-gta01-no-dev-set-drvdata.patch

Andy Green andy at openmoko.com
Mon Dec 1 12:51:19 CET 2008


Sean noticed that the fixes yesterday for pm_bt only set the drvdata
on GTA02 path, it will trash GTA01 operation of it.

Reported-by: Sean McNeil <sean at mcneil.com>
Signed-off-by: Andy Green <andy at openmoko.com>
---

 arch/arm/plat-s3c24xx/neo1973_pm_bt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
index 217fcf0..51f7366 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
@@ -217,6 +217,7 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
 	dev_info(&pdev->dev, DRVMSG ": starting\n");
 
 	bt_data = kzalloc(sizeof(*bt_data), GFP_KERNEL);
+	dev_set_drvdata(&pdev->dev, bt_data);
 
 	if (machine_is_neo1973_gta01()) {
 		/* we make sure that the voltage is off */
@@ -231,7 +232,6 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
 			return -ENODEV;
 
 		bt_data->regulator = regulator;
-		dev_set_drvdata(&pdev->dev, bt_data);
 
 		/* this tests the true physical state of the regulator... */
 		if (regulator_is_enabled(regulator)) {




More information about the openmoko-kernel mailing list