projects
/
GitHub
/
LineageOS
/
G12
/
android_kernel_amlogic_linux-4.9.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
494ab82
)
drm/nouveau: fixup the init failure paths some more
author
Ben Skeggs
<bskeggs@redhat.com>
Thu, 25 Mar 2010 06:00:09 +0000
(16:00 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Fri, 9 Apr 2010 00:12:30 +0000
(10:12 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_state.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c
index 1ee2b65d72e91ee3ff7ab5e30ca53e2c9c3f5eb8..a9e9cf35429cee993761cb2d5834ae619bb8f8f6 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_state.c
@@
-505,7
+505,7
@@
nouveau_card_init(struct drm_device *dev)
else
ret = nv04_display_create(dev);
if (ret)
- goto out_
irq
;
+ goto out_
channel
;
}
ret = nouveau_backlight_init(dev);
@@
-519,6
+519,11
@@
nouveau_card_init(struct drm_device *dev)
return 0;
+out_channel:
+ if (dev_priv->channel) {
+ nouveau_channel_free(dev_priv->channel);
+ dev_priv->channel = NULL;
+ }
out_irq:
drm_irq_uninstall(dev);
out_fifo:
@@
-536,6
+541,7
@@
out_mc:
out_gpuobj:
nouveau_gpuobj_takedown(dev);
out_mem:
+ nouveau_sgdma_takedown(dev);
nouveau_mem_close(dev);
out_instmem:
engine->instmem.takedown(dev);