From 8e9db58da3cee2ab3ecbd0263903ed0c8f320497 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 16 Jun 2011 16:36:24 -0400 Subject: [PATCH] --- yaml --- r: 269817 b: refs/heads/master c: 2294488da3402220120ff10360653a2ae3c15024 h: refs/heads/master i: 269815: c0778e3d9428b0b30ed5acc57706fbc7809b47cc v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_sdvo.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f19bc9a21575..2dcb1e8e9fc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46eb303682f72717d1a75cdd2309733bfed43396 +refs/heads/master: 2294488da3402220120ff10360653a2ae3c15024 diff --git a/trunk/drivers/gpu/drm/i915/intel_sdvo.c b/trunk/drivers/gpu/drm/i915/intel_sdvo.c index ed15c00aecdf..6cbbe5c3e062 100644 --- a/trunk/drivers/gpu/drm/i915/intel_sdvo.c +++ b/trunk/drivers/gpu/drm/i915/intel_sdvo.c @@ -1232,8 +1232,7 @@ static bool intel_sdvo_multifunc_encoder(struct intel_sdvo *intel_sdvo) { /* Is there more than one type of output? */ - int caps = intel_sdvo->caps.output_flags & 0xf; - return caps & -caps; + return hweight16(intel_sdvo->caps.output_flags) > 1; } static struct edid *