diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-18 07:39:47 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-18 07:39:47 (GMT) |
| commit | a5dd19249607474ed680f16b4f5e8477d2b68689 (patch) | |
| tree | 1aeeef053773c07bc02f3aa637febc80ceb96732 /drivers/thermal/samsung/exynos_tmu.c | |
| parent | 6b7e26547fad7ace3dcb27a5babd2317fb9d1e12 (diff) | |
| parent | 512255a2ad2c832ca7d4de9f31245f73781922d0 (diff) | |
| download | linux-a5dd19249607474ed680f16b4f5e8477d2b68689.tar.xz | |
Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
Conflicts:
arch/x86/entry/entry_64_compat.S
arch/x86/math-emu/get_address.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/thermal/samsung/exynos_tmu.c')
| -rw-r--r-- | drivers/thermal/samsung/exynos_tmu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 531f4b17..c96ff10 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -1296,7 +1296,6 @@ static struct thermal_zone_of_device_ops exynos_sensor_ops = { static int exynos_tmu_probe(struct platform_device *pdev) { - struct exynos_tmu_platform_data *pdata; struct exynos_tmu_data *data; int ret; @@ -1318,8 +1317,6 @@ static int exynos_tmu_probe(struct platform_device *pdev) if (ret) goto err_sensor; - pdata = data->pdata; - INIT_WORK(&data->irq_work, exynos_tmu_work); data->clk = devm_clk_get(&pdev->dev, "tmu_apbif"); @@ -1392,6 +1389,8 @@ err_clk_sec: if (!IS_ERR(data->clk_sec)) clk_unprepare(data->clk_sec); err_sensor: + if (!IS_ERR_OR_NULL(data->regulator)) + regulator_disable(data->regulator); thermal_zone_of_sensor_unregister(&pdev->dev, data->tzd); return ret; |