diff --git a/[refs] b/[refs] index 4418b91db00b..8f51a3856445 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd690dece9467a0178ebe8db0ddaaefdc180f0dd +refs/heads/master: d21a9d3ba52ae07662cc7832009b1502eda41072 diff --git a/trunk/drivers/staging/omapdrm/omap_crtc.c b/trunk/drivers/staging/omapdrm/omap_crtc.c index cbda7e027338..d87bd84257bd 100644 --- a/trunk/drivers/staging/omapdrm/omap_crtc.c +++ b/trunk/drivers/staging/omapdrm/omap_crtc.c @@ -263,8 +263,8 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, return crtc; fail: - if (crtc) { + if (crtc) omap_crtc_destroy(crtc); - } + return NULL; }