From owner-svn-src-all@FreeBSD.ORG Mon Jun 11 21:41:46 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 74A7E1065674; Mon, 11 Jun 2012 21:41:46 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5FB0B8FC32; Mon, 11 Jun 2012 21:41:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5BLfjSq012026; Mon, 11 Jun 2012 21:41:45 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5BLfj5G012024; Mon, 11 Jun 2012 21:41:45 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201206112141.q5BLfj5G012024@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 11 Jun 2012 21:41:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236931 - stable/9/sys/dev/drm2/i915 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2012 21:41:46 -0000 Author: kib Date: Mon Jun 11 21:41:45 2012 New Revision: 236931 URL: http://svn.freebsd.org/changeset/base/236931 Log: MFC r235925 (by dim): Fix a clang warning in drm2. Modified: stable/9/sys/dev/drm2/i915/intel_display.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/drm2/i915/intel_display.c ============================================================================== --- stable/9/sys/dev/drm2/i915/intel_display.c Mon Jun 11 21:41:16 2012 (r236930) +++ stable/9/sys/dev/drm2/i915/intel_display.c Mon Jun 11 21:41:45 2012 (r236931) @@ -8858,7 +8858,7 @@ static void ironlake_disable_rc6(struct if (I915_READ(PWRCTXA)) { /* Wake the GPU, prevent RC6, then restore RSTDBYCTL */ I915_WRITE(RSTDBYCTL, I915_READ(RSTDBYCTL) | RCX_SW_EXIT); - _intel_wait_for(dev, + (void)_intel_wait_for(dev, ((I915_READ(RSTDBYCTL) & RSX_STATUS_MASK) == RSX_STATUS_ON), 50, 1, "915pro");