Merge "power: qcom: msm-pm: Correct check for not null"

drivers/power/qcom/msm-pm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -550,7 +550,7 @@ static int msm_cpu_status_probe(struct platform_device *pdev)
		u32 cpu;
		int rc;

		if (!pdev \| !pdev->dev.of_node)
		if (!pdev \|\| !pdev->dev.of_node)
		return -EFAULT;

		msm_pm_slp_sts = devm_kzalloc(&pdev->dev,