projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
sti
/
sti_drm_drv.c
diff --git
a/drivers/gpu/drm/sti/sti_drm_drv.c
b/drivers/gpu/drm/sti/sti_drm_drv.c
index
8e64220
..
5239fa1
100644
(file)
--- a/
drivers/gpu/drm/sti/sti_drm_drv.c
+++ b/
drivers/gpu/drm/sti/sti_drm_drv.c
@@
-67,8
+67,12
@@
static int sti_drm_load(struct drm_device *dev, unsigned long flags)
sti_drm_mode_config_init(dev);
ret = component_bind_all(dev->dev, dev);
- if (ret)
+ if (ret) {
+ drm_kms_helper_poll_fini(dev);
+ drm_mode_config_cleanup(dev);
+ kfree(private);
return ret;
+ }
drm_helper_disable_unused_functions(dev);