summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding2015-07-03 14:16:30 +0200
committerThierry Reding2015-08-13 13:47:55 +0200
commit066d30f8c7547f9ca744cd090092d66847e85de4 (patch)
treeb529fc2e77e27b9281825e68bc39e7528226cac6
parentdrm/tegra: sor: Set minor after debugfs initialization (diff)
downloadkernel-qcow2-linux-066d30f8c7547f9ca744cd090092d66847e85de4.tar.gz
kernel-qcow2-linux-066d30f8c7547f9ca744cd090092d66847e85de4.tar.xz
kernel-qcow2-linux-066d30f8c7547f9ca744cd090092d66847e85de4.zip
drm/tegra: sor: Reset the correct debugfs fields
When tearing down debugfs support, make sure to reset the fields to NULL in the correct order, otherwise the debugfs root will not be properly removed. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/sor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 18b4d892bce2..bad63d0f5f13 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -861,10 +861,10 @@ static void tegra_sor_debugfs_exit(struct tegra_sor *sor)
sor->minor = NULL;
kfree(sor->debugfs_files);
- sor->debugfs = NULL;
+ sor->debugfs_files = NULL;
debugfs_remove_recursive(sor->debugfs);
- sor->debugfs_files = NULL;
+ sor->debugfs = NULL;
}
static void tegra_sor_connector_dpms(struct drm_connector *connector, int mode)