Skip to content

Commit

Permalink
thermal: int340x_thermal: Ignore missing _ART, _TRT tables
Browse files Browse the repository at this point in the history
It is possible that _ART/_TRT tables are missing or have errors.
Ignore those failures, as INT3400 thermal zone is still required
for _OSC or mode switch.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
  • Loading branch information
Srinivas Pandruvada authored and Zhang Rui committed Feb 28, 2015
1 parent 3a4562a commit f126079
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/thermal/int340x_thermal/int3400_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,12 @@ static int int3400_thermal_probe(struct platform_device *pdev)
result = acpi_parse_art(priv->adev->handle, &priv->art_count,
&priv->arts, true);
if (result)
goto free_priv;

dev_dbg(&pdev->dev, "_ART table parsing error\n");

result = acpi_parse_trt(priv->adev->handle, &priv->trt_count,
&priv->trts, true);
if (result)
goto free_art;
dev_dbg(&pdev->dev, "_TRT table parsing error\n");

platform_set_drvdata(pdev, priv);

Expand All @@ -281,7 +280,7 @@ static int int3400_thermal_probe(struct platform_device *pdev)
&int3400_thermal_params, 0, 0);
if (IS_ERR(priv->thermal)) {
result = PTR_ERR(priv->thermal);
goto free_trt;
goto free_art_trt;
}

priv->rel_misc_dev_res = acpi_thermal_rel_misc_device_add(
Expand All @@ -295,9 +294,8 @@ static int int3400_thermal_probe(struct platform_device *pdev)

free_zone:
thermal_zone_device_unregister(priv->thermal);
free_trt:
free_art_trt:
kfree(priv->trts);
free_art:
kfree(priv->arts);
free_priv:
kfree(priv);
Expand Down

0 comments on commit f126079

Please sign in to comment.