| From foo@baz Thu Nov 9 09:48:01 CET 2017 |
| From: Noralf Trønnes <noralf@tronnes.org> |
| Date: Thu, 26 Jan 2017 23:56:04 +0100 |
| Subject: drm: drm_minor_register(): Clean up debugfs on failure |
| |
| From: Noralf Trønnes <noralf@tronnes.org> |
| |
| |
| [ 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> |
| --- |
| drivers/gpu/drm/drm_drv.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/drm_drv.c |
| +++ b/drivers/gpu/drm/drm_drv.c |
| @@ -218,7 +218,7 @@ static int drm_minor_register(struct drm |
| 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); |
