Commit 0ab11d8e authored Nov 01, 2016 by Nicolae Rosia Committed by Tony Lindgren Nov 07, 2016

ARM: OMAP2+: avoid NULL pointer dereference



For OMAP4, volt_data is set in omap44xx_voltagedomains_init.
If the SoC is neither OMAP443X or OMAP446X, we end up with a
NULL in volt_data which causes a kernel oops.
This is the case when booting OMAP4470.

Signed-off-by: Nicolae Rosia <Nicolae_Rosia@mentor.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent 4ae46efc

arch/arm/mach-omap2/voltage.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,12 @@ int voltdm_scale(struct voltagedomain *voltdm,
		return -ENODATA;
		}

		if (!voltdm->volt_data) {
		pr_err("%s: No voltage data defined for vdd_%s\n",
		__func__, voltdm->name);
		return -ENODATA;
		}

		/* Adjust voltage to the exact voltage from the OPP table */
		for (i = 0; voltdm->volt_data[i].volt_nominal != 0; i++) {
		if (voltdm->volt_data[i].volt_nominal >= target_volt) {