Merge branch 'video' into release

Conflicts:
	drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>

diff --cc drivers/acpi/video.c
index 902fd526f32849a306282d43d7b673cf22a43dbf,097f24c87d82f130fdd4e9a453f7dc479ddd6333..94b1a4c5abab26978503835e4b5a9bf965776c6d
--- 1/drivers/acpi/video.c
--- 2/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -2006,18 -2028,15 +2030,18 @@@ static int acpi_video_bus_put_one_devic
        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) {
+       if (device->cooling_dev) {
                sysfs_remove_link(&device->dev->dev.kobj,
                                  "thermal_cooling");
-               sysfs_remove_link(&device->cdev->device.kobj,
+               sysfs_remove_link(&device->cooling_dev->device.kobj,
                                  "device");
-               thermal_cooling_device_unregister(device->cdev);
-               device->cdev = NULL;
+               thermal_cooling_device_unregister(device->cooling_dev);
+               device->cooling_dev = NULL;
        }
        video_output_unregister(device->output_dev);