xf86-video-ati: Branch 'master'

[Michel Dänzer]

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

New commits:
commit 3b893d81982c9381393c92625e308541e0071b05
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Fri May 13 09:10:02 2011 +0200

    KMS: Fix output properties logic error.
    
    Pointed out by clang:
    
    ../../src/drmmode_display.c:1023:30: error: use of logical && with constant operand; switch to bitwise & or remove constant [-Werror,-Wconstant-logical-operand]
                    if (props && (props->flags && DRM_MODE_PROP_ENUM)) {
                                               ^  ~~~~~~~~~~~~~~~~~~
    
    Reviewed-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 7873d57..afa4c26 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1020,7 +1020,7 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num, int *num_dv
 
 	for (i = 0; i < koutput->count_props; i++) {
 		props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-		if (props && (props->flags && DRM_MODE_PROP_ENUM)) {
+		if (props && (props->flags & DRM_MODE_PROP_ENUM)) {
 			if (!strcmp(props->name, "DPMS")) {
 				drmmode_output->dpms_enum_id = koutput->props[i];
 				drmModeFreeProperty(props);