aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-12-01 11:50:59 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-12-01 11:50:59 +0000
commit38ffd1ab3286b0cbdab30ab30214738f440c1924 (patch)
tree011418ddbbf3595cda713961c584d12160b74a21 /arch
parent3cc6c3047e6653297f31a72c9b96bb4381e0f24a (diff)
fix-pm-bt-gta01-no-dev-set-drvdata.patch
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@mcneil.com> Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-s3c24xx/neo1973_pm_bt.c2
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 217fcf05953..51f736618bd 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)) {