Merge "msm: spm: Do not fail in absence of vctl timeout node"

arch/arm/mach-msm/spm_devices.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -443,8 +443,6 @@ static int msm_spm_dev_probe(struct platform_device *pdev)
		ret = of_property_read_u32(node, key, &val);
		if (!ret)
		spm_data.vctl_timeout_us = val;
		else if (cpu == 0xffff)
		goto fail;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		if (!res)