1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 7f714fa2a454..1bc0c74f2755 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -713,7 +713,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 
         kfree(obj);
 
-        if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
+        if (device->cap._BCL && device->cap._BCM && max_level > 0) {
                 int result;
                 static int count = 0;
                 char *name;
@@ -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",
@@ -1198,7 +1201,7 @@ static int acpi_video_bus_ROM_seq_show(struct seq_file *seq, void *offset)
         if (!video)
                 goto end;
 
-        printk(KERN_INFO PREFIX "Please implement %s\n", __FUNCTION__);
+        printk(KERN_INFO PREFIX "Please implement %s\n", __func__);
         seq_printf(seq, "<TODO>\n");
 
       end: