From dc6527cc345308c5d6e40e456826815b56638c8b Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 8 Aug 2011 17:16:01 +0800 Subject: [PATCH] --- yaml --- r: 272003 b: refs/heads/master c: e9298028ee69bda44607156e7348cd32f7ab9360 h: refs/heads/master i: 272001: 41f6ff0cb4bf561af946ac4ff8e4efa7a92a432d 271999: 4e30b8318ec9359306401c718439f8d8485f6712 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/asus-wmi.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2d62b1b170fc..29b2d7ad8c41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d6afd150321a9e6f1180f5dced9032cce6861ac +refs/heads/master: e9298028ee69bda44607156e7348cd32f7ab9360 diff --git a/trunk/drivers/platform/x86/asus-wmi.c b/trunk/drivers/platform/x86/asus-wmi.c index 95cba9ebf6c0..d1049ee3c9e8 100644 --- a/trunk/drivers/platform/x86/asus-wmi.c +++ b/trunk/drivers/platform/x86/asus-wmi.c @@ -453,7 +453,9 @@ static enum led_brightness kbd_led_get(struct led_classdev *led_cdev) static void asus_wmi_led_exit(struct asus_wmi *asus) { - if (asus->tpd_led.dev) + if (!IS_ERR_OR_NULL(asus->kbd_led.dev)) + led_classdev_unregister(&asus->kbd_led); + if (!IS_ERR_OR_NULL(asus->tpd_led.dev)) led_classdev_unregister(&asus->tpd_led); if (asus->led_workqueue) destroy_workqueue(asus->led_workqueue);