From c1b764e393f48563f2deb315885458a32cdc1154 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 6 Aug 2009 15:57:54 -0700
Subject: [PATCH] --- yaml --- r: 157167 b: refs/heads/master c:
 e29b3ee3b005897fbdcfdd4b3190776e38739d70 h: refs/heads/master i:   157165:
 59d9d447ed58db0dfde61d03fb249c5d6f6bd49c   157163:
 e1f27243f8facc09a6bb10a52d287fe7e152b868   157159:
 d1580b5c39c73d61a1372e4866abe852435dbc93   157151:
 b56b856832e3749836859238835c1498e3b00808 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/acpi/video.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 926b3fd296ed..625be1589e30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82e7784f57a81faf673b09bc468e736d582fe754
+refs/heads/master: e29b3ee3b005897fbdcfdd4b3190776e38739d70
diff --git a/trunk/drivers/acpi/video.c b/trunk/drivers/acpi/video.c
index 8851315ce858..60ea984c84a0 100644
--- a/trunk/drivers/acpi/video.c
+++ b/trunk/drivers/acpi/video.c
@@ -2004,8 +2004,11 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
 	status = acpi_remove_notify_handler(device->dev->handle,
 					    ACPI_DEVICE_NOTIFY,
 					    acpi_video_device_notify);
-	sysfs_remove_link(&device->backlight->dev.kobj, "device");
-	backlight_device_unregister(device->backlight);
+	if (device->backlight) {
+		sysfs_remove_link(&device->backlight->dev.kobj, "device");
+		backlight_device_unregister(device->backlight);
+		device->backlight = NULL;
+	}
 	if (device->cdev) {
 		sysfs_remove_link(&device->dev->dev.kobj,
 				  "thermal_cooling");