[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 1350d5dfaac7dadf6cab9e812f0acfabcce60e58
Author: Tim Niemeyer <reddog at mastersword.de>
Date:   Thu Mar 26 01:19:15 2009 -0300

    extend work around boot-time ordering on GTA01
    
    [ Werner: Documentation/CodingStyle lines 166 and 448, put blank line after
      local variables. ]
    
    Signed-off-by: Tim Niemeyer <reddog at mastersword.de>
    Signed-off-by: Werner Almesberger <werner at openmoko.org>

diff --git a/drivers/power/pcf50606-charger.c b/drivers/power/pcf50606-charger.c
index 0f2aeda..fb02a79 100644
--- a/drivers/power/pcf50606-charger.c
+++ b/drivers/power/pcf50606-charger.c
@@ -36,6 +36,13 @@ struct pcf50606_mbc {
 void pcf50606_charge_fast(struct pcf50606 *pcf, int on)
 {
 	struct pcf50606_mbc *mbc = platform_get_drvdata(pcf->mbc_pdev);
+       /* this is a fix to work around boot-time ordering problems if
+	* the s3c2410_udc is initialized before the pcf50606 mbc is
+	* ready */
+	if (!mbc)
+	{
+		return;
+	}
 
 	if (on) {
 		pcf50606_reg_set_bit_mask(pcf, PCF50606_REG_MBCC1,

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