diff --git a/[refs] b/[refs]
index adede5d930f2..aa7ef32c2cea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d76628c67cdeebf84766a19c67c821c2e518baa4
+refs/heads/master: 43ff39f2f6450fa2e9a566f8bf007a26d76f2c9d
diff --git a/trunk/drivers/acpi/video.c b/trunk/drivers/acpi/video.c
index 7f714fa2a454..12cce69b5441 100644
--- a/trunk/drivers/acpi/video.c
+++ b/trunk/drivers/acpi/video.c
@@ -731,6 +731,9 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 
 		device->cdev = thermal_cooling_device_register("LCD",
 					device->dev, &video_cooling_ops);
+		if (IS_ERR(device->cdev))
+			return;
+
 		if (device->cdev) {
 			printk(KERN_INFO PREFIX
 				"%s is registered as cooling_device%d\n",