aboutsummaryrefslogtreecommitdiff
path: root/drivers/leds
diff options
context:
space:
mode:
authorTim Niemeyer <tim.niemeyer@mastersword.de>2009-03-27 18:10:36 +0100
committerWerner Almesberger <werner@openmoko.org>2009-03-31 04:35:24 -0300
commit3b770a4056e1c5ff907fdc50e6ea04e3a1499483 (patch)
treeab4de22eb2867b0cf59274610bec167321478cc5 /drivers/leds
parent18f5e41da61cfb512042c1978e24e07bde6917cf (diff)
This patch brings suspend/resume back to GTA01
"pdata" is NULL on GTA01 and you oops. Revised patch, this time with if(..) instead of #ifdef Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds-neo1973-vibrator.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
index e25ca4830bc..8bfb1179d03 100644
--- a/drivers/leds/leds-neo1973-vibrator.c
+++ b/drivers/leds/leds-neo1973-vibrator.c
@@ -129,7 +129,8 @@ static int neo1973_vib_init_hw(struct neo1973_vib_priv *vp)
static int neo1973_vib_suspend(struct platform_device *dev, pm_message_t state)
{
led_classdev_suspend(&neo1973_vib_led.cdev);
- neo1973_vib_priv.pdata->disable_fiq();
+ if (neo1973_vib_priv.pdata)
+ neo1973_vib_priv.pdata->disable_fiq();
return 0;
}
@@ -141,7 +142,8 @@ static int neo1973_vib_resume(struct platform_device *dev)
neo1973_vib_init_hw(vp);
led_classdev_resume(&neo1973_vib_led.cdev);
- neo1973_vib_priv.pdata->enable_fiq();
+ if (neo1973_vib_priv.pdata)
+ neo1973_vib_priv.pdata->enable_fiq();
return 0;
}