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

Commit a2ff8459 authored May 01, 2014 by Alexander Shiyan Committed by Lee Jones Jun 03, 2014

mfd: mc13xxx: Do not use platform data with devicetree



This patch removes platform data usage for codec and touchscreen
when driver is used with devicetree.
This fixes possible "null pointer dereference" error if DTS uses
"fsl,mc13xxx-uses-codec" or "fsl,mc13xxx-uses-touch" options.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent ac8320c4

drivers/mfd/mc13xxx-core.c

+10 −12

Original line number	Diff line number	Diff line
		@@ -673,21 +673,9 @@ int mc13xxx_common_init(struct device *dev)
		if (mc13xxx->flags & MC13XXX_USE_ADC)
		mc13xxx_add_subdevice(mc13xxx, "%s-adc");

		if (mc13xxx->flags & MC13XXX_USE_CODEC) {
		if (pdata)
		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
		pdata->codec, sizeof(*pdata->codec));
		else
		mc13xxx_add_subdevice(mc13xxx, "%s-codec");
		}

		if (mc13xxx->flags & MC13XXX_USE_RTC)
		mc13xxx_add_subdevice(mc13xxx, "%s-rtc");

		if (mc13xxx->flags & MC13XXX_USE_TOUCHSCREEN)
		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-ts",
		&pdata->touch, sizeof(pdata->touch));

		if (pdata) {
		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator",
		&pdata->regulators, sizeof(pdata->regulators));
		@@ -695,10 +683,20 @@ int mc13xxx_common_init(struct device *dev)
		pdata->leds, sizeof(*pdata->leds));
		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-pwrbutton",
		pdata->buttons, sizeof(*pdata->buttons));
		if (mc13xxx->flags & MC13XXX_USE_CODEC)
		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
		pdata->codec, sizeof(*pdata->codec));
		if (mc13xxx->flags & MC13XXX_USE_TOUCHSCREEN)
		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-ts",
		&pdata->touch, sizeof(pdata->touch));
		} else {
		mc13xxx_add_subdevice(mc13xxx, "%s-regulator");
		mc13xxx_add_subdevice(mc13xxx, "%s-led");
		mc13xxx_add_subdevice(mc13xxx, "%s-pwrbutton");
		if (mc13xxx->flags & MC13XXX_USE_CODEC)
		mc13xxx_add_subdevice(mc13xxx, "%s-codec");
		if (mc13xxx->flags & MC13XXX_USE_TOUCHSCREEN)
		mc13xxx_add_subdevice(mc13xxx, "%s-ts");
		}

		return 0;