提交 b432fc25 编写于 作者: C Chao Xie 提交者: Samuel Ortiz

mfd: 88pm800: Fix potential NULL pdata dereference

User pass platform data to device, and platform data may be
NULL. Add the check for pdata.
Signed-off-by: NChao Xie <chao.xie@marvell.com>
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>
上级 f4388ca7
......@@ -333,9 +333,11 @@ static int device_rtc_init(struct pm80x_chip *chip,
{
int ret;
rtc_devs[0].platform_data = pdata->rtc;
rtc_devs[0].pdata_size =
pdata->rtc ? sizeof(struct pm80x_rtc_pdata) : 0;
if (pdata) {
rtc_devs[0].platform_data = pdata->rtc;
rtc_devs[0].pdata_size =
pdata->rtc ? sizeof(struct pm80x_rtc_pdata) : 0;
}
ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],
ARRAY_SIZE(rtc_devs), NULL, 0, NULL);
if (ret) {
......@@ -578,7 +580,7 @@ static int pm800_probe(struct i2c_client *client,
goto err_device_init;
}
if (pdata->plat_config)
if (pdata && pdata->plat_config)
pdata->plat_config(chip, pdata);
return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册