This is not necessary after the below commit.

commit a0211bb482c346820506c546a6a58b8357999a99
Author: Ander Conselvan de Oliveira <[email protected]>
Date:   Mon Mar 30 14:05:43 2015 +0300

    drm/atomic: Don't try to free a NULL state

Signed-off-by: Ander Conselvan de Oliveira 
<[email protected]>
---
 drivers/gpu/drm/i915/intel_display.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 1a0ec52..9d9e633 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9772,10 +9772,8 @@ retry:
  fail:
        intel_crtc->new_enabled = crtc->state->enable;
 fail_unlock:
-       if (state) {
-               drm_atomic_state_free(state);
-               state = NULL;
-       }
+       drm_atomic_state_free(state);
+       state = NULL;
 
        if (ret == -EDEADLK) {
                drm_modeset_backoff(ctx);
@@ -12915,8 +12913,7 @@ fail:
        }
 
 out_config:
-       if (state)
-               drm_atomic_state_free(state);
+       drm_atomic_state_free(state);
 
        intel_set_config_free(config);
        return ret;
-- 
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to