[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit 3b770a4056e1c5ff907fdc50e6ea04e3a1499483
Author: Tim Niemeyer <tim.niemeyer at mastersword.de>
Date:   Fri Mar 27 18:10:36 2009 +0100

    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 at mastersword.de>

diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
index e25ca48..8bfb117 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;
 }

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko