diff options
| author |   James Morris <james.l.morris@oracle.com> | 2015-11-23 22:46:28 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-11-23 22:46:28 +1100 |
| commit | ebd68df3f24b318d391d15c458d6f43f340ba36a (patch) | |
| tree | f0277bc4b853abe5db1d30fa4e10b05bba7f2ac5 /drivers/net/wireless/ath/ath10k/thermal.c | |
| parent | security/capability.h: cap_issubset/isclear can be boolean (diff) | |
| parent | Linux 4.4-rc2 (diff) | |
| download | linux-dev-ebd68df3f24b318d391d15c458d6f43f340ba36a.tar.xz linux-dev-ebd68df3f24b318d391d15c458d6f43f340ba36a.zip | |
Sync to Linus v4.4-rc2 for LSM developers.
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/thermal.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/thermal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath10k/thermal.c b/drivers/net/wireless/ath/ath10k/thermal.c index 1a899d70dc5d..60fe562e3041 100644 --- a/drivers/net/wireless/ath/ath10k/thermal.c +++ b/drivers/net/wireless/ath/ath10k/thermal.c @@ -215,6 +215,6 @@ err_cooling_destroy: void ath10k_thermal_unregister(struct ath10k *ar) { - thermal_cooling_device_unregister(ar->thermal.cdev); sysfs_remove_link(&ar->dev->kobj, "cooling_device"); + thermal_cooling_device_unregister(ar->thermal.cdev); } |