Merge tag 'lsk-v4.4-17.03-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_atomic_helper.c

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 3f44b62b023e9360eb90d82ecb354c5f3bbfd02b..40a67eb373fa071639fcd626413899e67fe845e7 100644 (file)
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -265,7 +265,7 @@ mode_fixup(struct drm_atomic_state *state)
        struct drm_connector *connector;
        struct drm_connector_state *conn_state;
        int i;
-       bool ret;
+       int ret;
 
        for_each_crtc_in_state(state, crtc, crtc_state, i) {
                if (!crtc_state->mode_changed &&