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

drm/tegra: Properly reference count the DDC I2C adapter

Browse Source 
Use the of_get_i2c_adapter_by_node(), which is similar to the existing
call to of_find_i2c_adapter_by_node() except that it also takes a
reference to the owner module of the I2C adapter. In order to properly
balance this out, call i2c_put_adapter() to release the reference to the
I2C adapter and its owner module.

For the special case where the DDC comes from the DPAUX, care must be
taken to perform the same steps (i.e. get_device() and module_get()) so
that the reference counts are all balanced.

Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding 2020-04-08 20:01:00 +02:00
parent 9123e3a74e
commit 2340dc15f0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/tegra/output.c
View File

@ -112,7 +112,7 @@ int tegra_output_probe(struct tegra_output *output)
ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0); ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0);
if (ddc) { if (ddc) {
output->ddc = of_find_i2c_adapter_by_node(ddc); output->ddc = of_get_i2c_adapter_by_node(ddc);
if (!output->ddc) { if (!output->ddc) {
err = -EPROBE_DEFER; err = -EPROBE_DEFER;
of_node_put(ddc); of_node_put(ddc);
@ -173,7 +173,7 @@ void tegra_output_remove(struct tegra_output *output)
free_irq(output->hpd_irq, output); free_irq(output->hpd_irq, output);
if (output->ddc) if (output->ddc)
put_device(&output->ddc->dev); i2c_put_adapter(output->ddc);
} }
int tegra_output_init(struct drm_device *drm, struct tegra_output *output) int tegra_output_init(struct drm_device *drm, struct tegra_output *output)

7
drivers/gpu/drm/tegra/sor.c
View File

@ -3728,7 +3728,12 @@ static int tegra_sor_probe(struct platform_device *pdev)
if (!sor->aux) if (!sor->aux)
return -EPROBE_DEFER; return -EPROBE_DEFER;
sor->output.ddc = &sor->aux->ddc; if (get_device(&sor->aux->ddc.dev)) {
if (try_module_get(sor->aux->ddc.owner))
sor->output.ddc = &sor->aux->ddc;
else
put_device(&sor->aux->ddc.dev);
}
} }
if (!sor->aux) { if (!sor->aux) {