diff options
| author | Keith Packard <keithp@keithp.com> | 2009-08-06 15:57:54 -0700 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-08-28 15:17:07 -0400 |
| commit | e29b3ee3b005897fbdcfdd4b3190776e38739d70 (patch) | |
| tree | cb27db40bc33117aebe3d60a7eef33317f9df5b0 | |
| parent | 82e7784f57a81faf673b09bc468e736d582fe754 (diff) | |
| download | linux-stable-e29b3ee3b005897fbdcfdd4b3190776e38739d70.tar.gz linux-stable-e29b3ee3b005897fbdcfdd4b3190776e38739d70.tar.bz2 linux-stable-e29b3ee3b005897fbdcfdd4b3190776e38739d70.zip | |
ACPI: don't free non-existent backlight in acpi video module
acpi_video_put_one_device was attempting to remove sysfs entries and
unregister a backlight device without first checking that said backlight
device structure had been created.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/video.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 8851315ce858..60ea984c84a0 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -2004,8 +2004,11 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device) 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) { sysfs_remove_link(&device->dev->dev.kobj, "thermal_cooling"); |