summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Gerlach <d-gerlach@ti.com>2016-04-05 14:05:38 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-07 18:14:34 -0700
commit3b2321716df07e7a61fdc8a7e54d2a85c878d758 (patch)
treecf3a789080ee6e70694f96a2f21125dbd8ed12bb
parenta1e15f5ae6d69e834b751b719d007b380f4a42fb (diff)
downloadarm64-stable-rc-3b2321716df07e7a61fdc8a7e54d2a85c878d758.tar.gz
cpuidle: Indicate when a device has been unregistered
commit c998c07836f985b24361629dc98506ec7893e7a0 upstream. Currently the 'registered' member of the cpuidle_device struct is set to 1 during cpuidle_register_device. In this same function there are checks to see if the device is already registered to prevent duplicate calls to register the device, but this value is never set to 0 even on unregister of the device. Because of this, any attempt to call cpuidle_register_device after a call to cpuidle_unregister_device will fail which shouldn't be the case. To prevent this, set registered to 0 when the device is unregistered. Fixes: c878a52d3c7c (cpuidle: Check if device is already registered) Signed-off-by: Dave Gerlach <d-gerlach@ti.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/cpuidle/cpuidle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 17a6dc0e2111..f0541efedb37 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -433,6 +433,8 @@ static void __cpuidle_unregister_device(struct cpuidle_device *dev)
list_del(&dev->device_list);
per_cpu(cpuidle_devices, dev->cpu) = NULL;
module_put(drv->owner);
+
+ dev->registered = 0;
}
static void __cpuidle_device_init(struct cpuidle_device *dev)