openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/tegra: gr2d: Properly clean up resources 

Failure to register the Tegra DRM client would leak the resources. Move
cleanup code to error unwinding gotos to fix that and share the cleanup
code with the other error paths.

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding 2018-05-04 14:58:26 +02:00
parent fd5ec0dc34
commit dd99b4b488
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/drm/tegra/gr2d.c
View File

@ -42,8 +42,9 @@ static int gr2d_init(struct host1x_client *client)
client->syncpts[0] = host1x_syncpt_request(client, flags); client->syncpts[0] = host1x_syncpt_request(client, flags);
if (!client->syncpts[0]) { if (!client->syncpts[0]) {
host1x_channel_put(gr2d->channel); err = -ENOMEM;
return -ENOMEM; dev_err(client->dev, "failed to request syncpoint: %d\n", err);
goto put;
} }
if (tegra->domain) { if (tegra->domain) {
@ -55,15 +56,30 @@ static int gr2d_init(struct host1x_client *client)
dev_err(client->dev, dev_err(client->dev,
"failed to attach to domain: %d\n", "failed to attach to domain: %d\n",
err); err);
host1x_syncpt_free(client->syncpts[0]);
host1x_channel_put(gr2d->channel);
iommu_group_put(gr2d->group); iommu_group_put(gr2d->group);
return err; goto free;
} }
} }
} }
return tegra_drm_register_client(tegra, drm); err = tegra_drm_register_client(tegra, drm);
if (err < 0) {
dev_err(client->dev, "failed to register client: %d\n", err);
goto detach;
}
return 0;
detach:
if (gr2d->group) {
iommu_detach_group(tegra->domain, gr2d->group);
iommu_group_put(gr2d->group);
}
free:
host1x_syncpt_free(client->syncpts[0]);
put:
host1x_channel_put(gr2d->channel);
return err;
} }
static int gr2d_exit(struct host1x_client *client) static int gr2d_exit(struct host1x_client *client)