diff --git a/[refs] b/[refs]
index 0fc53c887d98..b9f73e7cf42e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa12242f19312b2c60399bd581929fdfc511a017
+refs/heads/master: 4a55320117e2ca4ed9002a365d7e209d73abcdf1
diff --git a/trunk/drivers/mfd/s5m-core.c b/trunk/drivers/mfd/s5m-core.c
index e075c113eec6..caadabeed8e9 100644
--- 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);