leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/tegra: dpaux: Fix crash if VDD supply is absent

Browse Source 
In order to properly make the VDD supply optional, all accesses to the
regulator need to be ignored, because the regulator core doesn't treat
NULL special.

Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding
2019-06-24 13:30:24 +02:00
parent 245ce70cd4
commit 6c79f09fce
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/tegra/dpaux.c
View File

@@ -505,6 +505,8 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
return PTR_ERR(dpaux->vdd); return PTR_ERR(dpaux->vdd);
} }
dpaux->vdd = NULL;
} }
platform_set_drvdata(pdev, dpaux); platform_set_drvdata(pdev, dpaux);
@@ -698,12 +700,14 @@ int drm_dp_aux_attach(struct drm_dp_aux *aux, struct tegra_output *output)
output->connector.polled = DRM_CONNECTOR_POLL_HPD; output->connector.polled = DRM_CONNECTOR_POLL_HPD;
dpaux->output = output; dpaux->output = output;
if (output->panel) {
enum drm_connector_status status;
if (dpaux->vdd) {
err = regulator_enable(dpaux->vdd); err = regulator_enable(dpaux->vdd);
if (err < 0) if (err < 0)
return err; return err;
}
if (output->panel) {
enum drm_connector_status status;
timeout = jiffies + msecs_to_jiffies(250); timeout = jiffies + msecs_to_jiffies(250);
@@ -732,12 +736,14 @@ int drm_dp_aux_detach(struct drm_dp_aux *aux)
disable_irq(dpaux->irq); disable_irq(dpaux->irq);
if (dpaux->output->panel) {
enum drm_connector_status status;
if (dpaux->vdd) {
err = regulator_disable(dpaux->vdd); err = regulator_disable(dpaux->vdd);
if (err < 0) if (err < 0)
return err; return err;
}
if (dpaux->output->panel) {
enum drm_connector_status status;
timeout = jiffies + msecs_to_jiffies(250); timeout = jiffies + msecs_to_jiffies(250);