diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-03-25 02:01:04 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-04-08 20:15:17 -0400 |
| commit | a1663ed3412f4b94edcf30b271c9db3ace533605 (patch) | |
| tree | b1ae58bb53cb1471b521d832e7942680ec7d3900 | |
| parent | 78bb35129e9400fb50580e971d964563fc8e0218 (diff) | |
drm/nv50: cleanup properly if PDISPLAY init fails
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index bd99986a1146..fd00f4000f14 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
| @@ -529,8 +529,10 @@ int nv50_display_create(struct drm_device *dev) | |||
| 529 | } | 529 | } |
| 530 | 530 | ||
| 531 | ret = nv50_display_init(dev); | 531 | ret = nv50_display_init(dev); |
| 532 | if (ret) | 532 | if (ret) { |
| 533 | nv50_display_destroy(dev); | ||
| 533 | return ret; | 534 | return ret; |
| 535 | } | ||
| 534 | 536 | ||
| 535 | return 0; | 537 | return 0; |
| 536 | } | 538 | } |
