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

Commit b7868c68 authored by Stefan Agner's avatar Stefan Agner Committed by Thierry Reding
Browse files

drm/fsl-dcu: use drm_mode_config_cleanup on initialization errors 



Commit 7566e247 ("drm/fsl-dcu: handle initialization errors properly")
introduced error handling during initialization, but with a wrong cleanup
order.

Replace the error handling with the generic cleanup function
drm_mode_config_cleanup.

Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160619021543.23587-1-stefan@agner.ch
parent e06a44c1

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c

+6 −7
Original line number Diff line number Diff line
@@ -37,23 +37,22 @@ int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev) 


	ret = fsl_dcu_drm_crtc_create(fsl_dev);

	if (ret)

		return ret;

		goto err;



	ret = fsl_dcu_drm_encoder_create(fsl_dev, &fsl_dev->crtc);

	if (ret)

		goto fail_encoder;

		goto err;



	ret = fsl_dcu_drm_connector_create(fsl_dev, &fsl_dev->encoder);

	if (ret)

		goto fail_connector;

		goto err;



	drm_mode_config_reset(fsl_dev->drm);

	drm_kms_helper_poll_init(fsl_dev->drm);



	return 0;

fail_encoder:

	fsl_dev->crtc.funcs->destroy(&fsl_dev->crtc);

fail_connector:

	fsl_dev->encoder.funcs->destroy(&fsl_dev->encoder);



err:

	drm_mode_config_cleanup(fsl_dev->drm);

	return ret;

}