diff options
author | Matthew Garrett <mjg@redhat.com> | 2011-03-28 08:46:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 16:05:29 -0400 |
commit | 445aef374594207b278477dfd98fc5d1498d353a (patch) | |
tree | 6116b34ba9eeb210709b22b1d04d33f32b0ba086 /drivers/acpi | |
parent | 03e4970c10151c5fb25ddd7e9a142d63c6a8d058 (diff) |
acpi: Remove sysfs_create_link from video driver
The acpi video driver attempts to explicitly create a sysfs link between
the acpi device and the associated PCI device. However, we're now also
doing this from the backlight core, which means that we get a backtrace
caused by a duplicate file. Remove the code and leave it up to the
backlight core.
Reported-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Tested-by: Alessandro Suardi <alessandro.suardi@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/video.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index a18e497f1c3c..31e9e10f657e 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -824,11 +824,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) | |||
824 | device->backlight->props.brightness = | 824 | device->backlight->props.brightness = |
825 | acpi_video_get_brightness(device->backlight); | 825 | acpi_video_get_brightness(device->backlight); |
826 | 826 | ||
827 | result = sysfs_create_link(&device->backlight->dev.kobj, | ||
828 | &device->dev->dev.kobj, "device"); | ||
829 | if (result) | ||
830 | printk(KERN_ERR PREFIX "Create sysfs link\n"); | ||
831 | |||
832 | device->cooling_dev = thermal_cooling_device_register("LCD", | 827 | device->cooling_dev = thermal_cooling_device_register("LCD", |
833 | device->dev, &video_cooling_ops); | 828 | device->dev, &video_cooling_ops); |
834 | if (IS_ERR(device->cooling_dev)) { | 829 | if (IS_ERR(device->cooling_dev)) { |
@@ -1381,7 +1376,6 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device) | |||
1381 | "Cant remove video notify handler\n"); | 1376 | "Cant remove video notify handler\n"); |
1382 | } | 1377 | } |
1383 | if (device->backlight) { | 1378 | if (device->backlight) { |
1384 | sysfs_remove_link(&device->backlight->dev.kobj, "device"); | ||
1385 | backlight_device_unregister(device->backlight); | 1379 | backlight_device_unregister(device->backlight); |
1386 | device->backlight = NULL; | 1380 | device->backlight = NULL; |
1387 | } | 1381 | } |