diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-04-19 21:01:46 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 02:31:56 -0400 |
commit | a8f81837c506aba186b42f0c67633e85851395b1 (patch) | |
tree | 522ff28e562b4fc9eacf7d51d9f4d7a7763afdb5 /drivers/gpu/drm/nouveau/nv50_display.c | |
parent | 5ace2c9d6f5bc4600ca43fe188a33efc4c2dba79 (diff) |
drm/nv50/disp: fixup error paths in crtc object creation
Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 211e5e9565ce..b526e3f61c17 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
@@ -358,8 +358,11 @@ nv50_display_create(struct drm_device *dev) | |||
358 | dev_priv->engine.display.priv = priv; | 358 | dev_priv->engine.display.priv = priv; |
359 | 359 | ||
360 | /* Create CRTC objects */ | 360 | /* Create CRTC objects */ |
361 | for (i = 0; i < 2; i++) | 361 | for (i = 0; i < 2; i++) { |
362 | nv50_crtc_create(dev, i); | 362 | ret = nv50_crtc_create(dev, i); |
363 | if (ret) | ||
364 | return ret; | ||
365 | } | ||
363 | 366 | ||
364 | /* We setup the encoders from the BIOS table */ | 367 | /* We setup the encoders from the BIOS table */ |
365 | for (i = 0 ; i < dcb->entries; i++) { | 368 | for (i = 0 ; i < dcb->entries; i++) { |