aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvif
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-05-25 17:02:11 +1000
committerBen Skeggs <bskeggs@redhat.com>2017-02-17 15:14:59 +1000
commit05da248bbe91fecb29e1f2fb9b978c4d2ee6da8e (patch)
treeeadfc286e9baca4ba0cee2d9e71cd6fd733ba1ae /drivers/gpu/drm/nouveau/nvif
parentdrm/nouveau/core/client: use standard object dtor/init/fini paths (diff)
downloadlinux-dev-05da248bbe91fecb29e1f2fb9b978c4d2ee6da8e.tar.xz
linux-dev-05da248bbe91fecb29e1f2fb9b978c4d2ee6da8e.zip
drm/nouveau/core/client: destroy client objects over nvif
Preparation for supporting subclients, and also good for consistency. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvif')
-rw-r--r--drivers/gpu/drm/nouveau/nvif/client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvif/client.c b/drivers/gpu/drm/nouveau/nvif/client.c
index 29c20dfd894d..ad1307b6f783 100644
--- a/drivers/gpu/drm/nouveau/nvif/client.c
+++ b/drivers/gpu/drm/nouveau/nvif/client.c
@@ -47,11 +47,11 @@ nvif_client_resume(struct nvif_client *client)
void
nvif_client_fini(struct nvif_client *client)
{
+ nvif_object_fini(&client->object);
if (client->driver) {
- client->driver->fini(client->object.priv);
+ if (client->driver->fini)
+ client->driver->fini(client->object.priv);
client->driver = NULL;
- client->object.client = NULL;
- nvif_object_fini(&client->object);
}
}