diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-03 15:19:12 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-03 15:19:12 -0800 |
| commit | 48346892ff2a2bd66301875ebffd408627419feb (patch) | |
| tree | 8e96e67a5b58f29369c46230c6175409be1c2cd1 /drivers/acpi | |
| parent | b40e9dc0b4967b198fefeabab0e2ba673c887ec3 (diff) | |
| parent | f7d7f59ab124748156ea551edf789994f05da342 (diff) | |
Merge tag 'usb-serial-4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial fixes for v4.4-rc8
Here's another device id for cp210x.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_driver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index f4e02ae93f58..11154a330f07 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -200,7 +200,8 @@ static int acpi_pss_perf_init(struct acpi_processor *pr, goto err_remove_sysfs_thermal; } - sysfs_remove_link(&pr->cdev->device.kobj, "device"); + return 0; + err_remove_sysfs_thermal: sysfs_remove_link(&device->dev.kobj, "thermal_cooling"); err_thermal_unregister: |