Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fcf71aa authored by Axel Lin's avatar Axel Lin Committed by Matthew Garrett
Browse files

platform-drivers-x86: asus-laptop: fix wrong test for successful registered led_classdev 



device_create returns &struct device pointer on success, or ERR_PTR() on error.
Thus if led_classdev_register fails, led_cdev->dev is always not NULL.

Thus to unregister a successful registered led_classdev, we should check
IS_ERR_OR_NULL macro for led_cdev->dev instead of checking if led_cdev->dev
is NULL or not.

we use IS_ERR_OR_NULL instead of IS_ERR because if we havn't call
led_classdev_register, the led_cdev->dev is NULL.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarCorentin Chary <corentin.chary@gmail.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent e9298028

drivers/platform/x86/asus-laptop.c

+6 −6
Original line number Diff line number Diff line
@@ -459,17 +459,17 @@ static enum led_brightness asus_kled_cdev_get(struct led_classdev *led_cdev) 


static void asus_led_exit(struct asus_laptop *asus)

{

	if (asus->mled.led.dev)

	if (!IS_ERR_OR_NULL(asus->mled.led.dev))

		led_classdev_unregister(&asus->mled.led);

	if (asus->tled.led.dev)

	if (!IS_ERR_OR_NULL(asus->tled.led.dev))

		led_classdev_unregister(&asus->tled.led);

	if (asus->pled.led.dev)

	if (!IS_ERR_OR_NULL(asus->pled.led.dev))

		led_classdev_unregister(&asus->pled.led);

	if (asus->rled.led.dev)

	if (!IS_ERR_OR_NULL(asus->rled.led.dev))

		led_classdev_unregister(&asus->rled.led);

	if (asus->gled.led.dev)

	if (!IS_ERR_OR_NULL(asus->gled.led.dev))

		led_classdev_unregister(&asus->gled.led);

	if (asus->kled.led.dev)

	if (!IS_ERR_OR_NULL(asus->kled.led.dev))

		led_classdev_unregister(&asus->kled.led);

	if (asus->led_workqueue) {

		destroy_workqueue(asus->led_workqueue);