---

yaml --- r: 296817 b: refs/heads/master c: c3ebb30 h: refs/heads/master i: 296815: 36dcffd v: v3
git-mirror · Mar 6, 2012 · 0109daa · 0109daa
1 parent 4630ae8
commit 0109daa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2d5cb47e3e7e0f68d33d18ca15e4ac65ca5645b
+refs/heads/master: c3ebb30aaeb2a30d69b9db564d93bf3486139c12
diff --git a/trunk/drivers/mfd/s5m-core.c b/trunk/drivers/mfd/s5m-core.c
@@ -105,7 +105,7 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c,
 	s5m87xx->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);
 	i2c_set_clientdata(s5m87xx->rtc, s5m87xx);
 
-	if (pdata->cfg_pmic_irq)
+	if (pdata && pdata->cfg_pmic_irq)
 		pdata->cfg_pmic_irq();
 
 	s5m_irq_init(s5m87xx);