1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f9fe9894637a..b6743281a97b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2184,14 +2184,13 @@ static struct cxsr_latency *intel_get_cxsr_latency(int is_desktop, int fsb,
         for (i = 0; i < ARRAY_SIZE(cxsr_latency_table); i++) {
                 latency = &cxsr_latency_table[i];
                 if (is_desktop == latency->is_desktop &&
-                        fsb == latency->fsb_freq && mem == latency->mem_freq)
-                        break;
-        }
-        if (i >= ARRAY_SIZE(cxsr_latency_table)) {
-                DRM_DEBUG("Unknown FSB/MEM found, disable CxSR\n");
-                return NULL;
+                    fsb == latency->fsb_freq && mem == latency->mem_freq)
+                        return latency;
         }
-        return latency;
+
+        DRM_DEBUG("Unknown FSB/MEM found, disable CxSR\n");
+
+        return NULL;
 }
 
 static void igd_disable_cxsr(struct drm_device *dev)