提交 e5d958ef 编写于 作者: A Ander Conselvan de Oliveira 提交者: Daniel Vetter

drm/i915: Don't check for NULL before freeing state

This is not necessary after the below commit.

commit a0211bb4
Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Date:   Mon Mar 30 14:05:43 2015 +0300

    drm/atomic: Don't try to free a NULL state
Signed-off-by: NAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: NMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 ce22dba9
无相关合并请求
......@@ -9860,10 +9860,8 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
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);
......@@ -13003,8 +13001,7 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
}
out_config:
if (state)
drm_atomic_state_free(state);
drm_atomic_state_free(state);
intel_set_config_free(config);
return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册