diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2016-05-17 23:56:06 +0800 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-05-30 08:28:33 +0200 |
| commit | 13fef095bde04228316046f997eb963285d8532e (patch) | |
| tree | a2548963041b9da7b3da20de8c4b6c88c38437f2 | |
| parent | 7aa2e2b731b337a7bc74cd076bbcd6b8b4b95fbf (diff) | |
drm: sun4i: do cleanup if RGB output init failssunxi-drm-fixes-for-4.7
sun4i_rgb_init() can fail, which results in TCON failing to bind.
In this case we need to do cleanup, specificly unregistering the
dotclock, which is regmap based, and the regmap is registered as
part of the sun4i_tcon_bind().
Failing to do so results in a NULL pointer reference when the CCF
tries to turn off unused clocks.
Fixes: 29e57fab97fc ("drm: sun4i: Add RGB output")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun4i_tcon.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c index 16ab426ffa34..652385f09735 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c @@ -490,7 +490,11 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, return 0; } - return sun4i_rgb_init(drm); + ret = sun4i_rgb_init(drm); + if (ret < 0) + goto err_free_clocks; + + return 0; err_free_clocks: sun4i_tcon_free_clocks(tcon); |