drm: drm_minor_register(): Clean up debugfs on failure

notro · gregkh · commit 2393241b7a22 · 2017-11-15T17:13:09.000+01:00
[ Upstream commit a67834f8bfa1e2f48bb27d07b9a552ba7c3af82a ] Call drm_debugfs_cleanup() in case drm_debugfs_init() fails to cover for failure in the drm_driver.debugfs_init callback. Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20170126225621.12314-3-noralf@tronnes.org Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
@@ -312,7 +312,7 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type)
 	ret = drm_debugfs_init(minor, minor->index, drm_debugfs_root);
 	if (ret) {
 		DRM_ERROR("DRM: Failed to initialize /sys/kernel/debug/dri.\n");
-		return ret;
+		goto err_debugfs;
 	}
 
 	ret = device_add(minor->kdev);

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type)`
`312`	`312`	`ret = drm_debugfs_init(minor, minor->index, drm_debugfs_root);`
`313`	`313`	`if (ret) {`
`314`	`314`	`DRM_ERROR("DRM: Failed to initialize /sys/kernel/debug/dri.\n");`
`315`		`- return ret;`
	`315`	`+ goto err_debugfs;`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`ret = device_add(minor->kdev);`