Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dfcb36a authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/fb-helper: Fix connector ref leak on error 



We need to drop the connector references already taken when we
abort in the middle of drm_fb_helper_single_add_all_connectors()

Cc: stable@vger.kernel.org
Cc: Carlos Santa <carlos.santa@intel.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Tested-by: default avatarCarlos Santa <carlos.santa@intel.com>
Tested-by: default avatarKirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1477472755-15288-2-git-send-email-ville.syrjala@linux.intel.com
parent 87d3b658

drivers/gpu/drm/drm_fb_helper.c

+6 −1
Original line number Diff line number Diff line
@@ -131,7 +131,12 @@ int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper) 
	return 0;

fail:

	for (i = 0; i < fb_helper->connector_count; i++) {

		kfree(fb_helper->connector_info[i]);

		struct drm_fb_helper_connector *fb_helper_connector =

			fb_helper->connector_info[i];



		drm_connector_unreference(fb_helper_connector->connector);



		kfree(fb_helper_connector);

		fb_helper->connector_info[i] = NULL;

	}

	fb_helper->connector_count = 0;