diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-06 20:53:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-01-06 20:53:28 +0100 |
| commit | 3f37b26f8d57756b591383a9d8ce1cd628bc773c (patch) | |
| tree | 0311f4c48cfa7ace3940f3db203b930a2c2eaaa5 /drivers/acpi/processor_driver.c | |
| parent | c7b60a89516beb20a352ec85c73a8fccd5becf26 (diff) | |
| parent | bc42f363da213b4bf7c15a2dc87b2b1a85cde867 (diff) | |
Merge tag 'asoc-fix-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linussound-4.4
ASoC: Last minute fixes for v4.4
A few final fixes for v4.4, the main one being the two patches to the
new Sky Lake drivers which fix a previous incorrect fix that went in
during an earlier -rc.
Diffstat (limited to 'drivers/acpi/processor_driver.c')
| -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: |