Merge ../linus

[linux-2.6] / drivers / acpi / video.c

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 86531ab4ee5517dcf86676641fcae415cad4f980..e7e9a693953a7bb58f37a0b446c9f7e6942c74b8 100644 (file)
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1645,7 +1645,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
                        printk(KERN_WARNING PREFIX
                               "hhuuhhuu bug in acpi video driver.\n");
 
-               if (data->brightness);
+               if (data->brightness)
                        kfree(data->brightness->levels);
                kfree(data->brightness);
                kfree(data);