aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-24 22:18:44 -0400
committerLen Brown <len.brown@intel.com>2007-08-24 22:18:44 -0400
commitca1f32a76bcd5fb3d655a989edd7c004c4a63bc6 (patch)
tree148efd6a50562356e02f31eb09b0d8c05ed2c017
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff)
parentasus-laptop: Fix rmmod of asus_laptop (diff)
downloadlinux-dev-ca1f32a76bcd5fb3d655a989edd7c004c4a63bc6.tar.xz
linux-dev-ca1f32a76bcd5fb3d655a989edd7c004c4a63bc6.zip
Pull asus into release branch
-rw-r--r--drivers/misc/asus-laptop.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index d0fc4fd212e6..40db9f70148f 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -1072,7 +1072,8 @@ static void asus_backlight_exit(void)
}
#define ASUS_LED_UNREGISTER(object) \
- led_classdev_unregister(&object##_led)
+ if (object##_led.dev) \
+ led_classdev_unregister(&object##_led)
static void asus_led_exit(void)
{