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>
This commit is contained in:
parent
03e4970c10
commit
445aef3745
1 changed files with 0 additions and 6 deletions
|
@ -824,11 +824,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
|
||||||
device->backlight->props.brightness =
|
device->backlight->props.brightness =
|
||||||
acpi_video_get_brightness(device->backlight);
|
acpi_video_get_brightness(device->backlight);
|
||||||
|
|
||||||
result = sysfs_create_link(&device->backlight->dev.kobj,
|
|
||||||
&device->dev->dev.kobj, "device");
|
|
||||||
if (result)
|
|
||||||
printk(KERN_ERR PREFIX "Create sysfs link\n");
|
|
||||||
|
|
||||||
device->cooling_dev = thermal_cooling_device_register("LCD",
|
device->cooling_dev = thermal_cooling_device_register("LCD",
|
||||||
device->dev, &video_cooling_ops);
|
device->dev, &video_cooling_ops);
|
||||||
if (IS_ERR(device->cooling_dev)) {
|
if (IS_ERR(device->cooling_dev)) {
|
||||||
|
@ -1381,7 +1376,6 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
|
||||||
"Cant remove video notify handler\n");
|
"Cant remove video notify handler\n");
|
||||||
}
|
}
|
||||||
if (device->backlight) {
|
if (device->backlight) {
|
||||||
sysfs_remove_link(&device->backlight->dev.kobj, "device");
|
|
||||||
backlight_device_unregister(device->backlight);
|
backlight_device_unregister(device->backlight);
|
||||||
device->backlight = NULL;
|
device->backlight = NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue