Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b432fc25 authored by Chao Xie's avatar Chao Xie Committed by Samuel Ortiz
Browse files

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: default avatarChao Xie <chao.xie@marvell.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent f4388ca7

drivers/mfd/88pm800.c

+6 −4
Original line number Diff line number Diff line
@@ -333,9 +333,11 @@ static int device_rtc_init(struct pm80x_chip *chip, 
{

	int ret;



	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;