Merge "qcom: core_ctl_helper: Fix potential NULL pointer dereference" (c2d22797) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/soc/qcom/core_ctl_helper.c

+17 −3

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -58,9 +58,16 @@ EXPORT_SYMBOL(core_ctl_find_cpu_device);
		int __ref core_ctl_online_core(unsigned int cpu)
		{
		int ret;
		struct device *dev;

		lock_device_hotplug();
		ret = device_online(get_cpu_device(cpu));
		dev = get_cpu_device(cpu);
		if (!dev) {
		pr_err("%s: failed to get cpu%d device\n", __func__, cpu);
		ret = -ENODEV;
		} else {
		ret = device_online(dev);
		}
		unlock_device_hotplug();
		return ret;
		}
		@@ -69,9 +76,16 @@ EXPORT_SYMBOL(core_ctl_online_core);
		int __ref core_ctl_offline_core(unsigned int cpu)
		{
		int ret;
		struct device *dev;

		lock_device_hotplug();
		ret = device_offline(get_cpu_device(cpu));
		dev = get_cpu_device(cpu);
		if (!dev) {
		pr_err("%s: failed to get cpu%d device\n", __func__, cpu);
		ret = -ENODEV;
		} else {
		ret = device_offline(dev);
		}
		unlock_device_hotplug();
		return ret;
		}