From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 06:31:39 +0000 (-0400)
Subject: Merge branch 'video' into release
X-Git-Tag: v2.6.32-rc1~171^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=193a6dec1c0246a80b6d0101e4f351ccf877bcac;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'video' into release

Conflicts:
	drivers/acpi/video.c

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

193a6dec1c0246a80b6d0101e4f351ccf877bcac
diff --cc drivers/acpi/video.c
index 902fd526f3284,097f24c87d82f..94b1a4c5abab2
--- a/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);