]> git.hungrycats.org Git - linux/commitdiff
cpuidle: Indicate when a device has been unregistered
authorDave Gerlach <d-gerlach@ti.com>
Tue, 5 Apr 2016 19:05:38 +0000 (14:05 -0500)
committerSasha Levin <sasha.levin@oracle.com>
Wed, 1 Jun 2016 20:26:25 +0000 (16:26 -0400)
[ Upstream commit c998c07836f985b24361629dc98506ec7893e7a0 ]

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>
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/cpuidle/cpuidle.c

index 9ab99642ca7a4e6c7a08d720735277b2acef0806..5a4ff9c7ce008dc3cf631327e51e8ea708243fe4 100644 (file)
@@ -355,6 +355,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)