xf86-video-intel: src/sna/sna_display.c

Chris Wilson ickle at kemper.freedesktop.org
Wed May 7 05:50:47 PDT 2014


 src/sna/sna_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18416b5162e6d6e5415916c55c935b08c980d7f3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 7 13:49:13 2014 +0100

    sna: Don't assign in an assert
    
    That just nullifies the point of the assert in the first place.
    
    Spotted-by: Joakim Tjernlund
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 5ce967c..df80f1e 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2813,7 +2813,7 @@ sna_output_add(struct sna *sna, int id, int serial)
 		}
 
 		possible_crtcs = enc.possible_crtcs;
-		assert(enc.encoder_id = compat_conn.conn.encoder_id || compat_conn.conn.encoder_id == 0);
+		assert(enc.encoder_id == compat_conn.conn.encoder_id || compat_conn.conn.encoder_id == 0);
 	} else {
 		DBG(("%s: unexpected number [%d] of encoders attached\n",
 		     __FUNCTION__, compat_conn.conn.count_encoders));


More information about the xorg-commit mailing list