From owner-svn-src-all@FreeBSD.ORG  Fri Mar 20 17:51:26 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC5F810656C0;
	Fri, 20 Mar 2009 17:51:26 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CA3138FC26;
	Fri, 20 Mar 2009 17:51:26 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2KHpQLi009222;
	Fri, 20 Mar 2009 17:51:26 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2KHpQAi009221;
	Fri, 20 Mar 2009 17:51:26 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200903201751.n2KHpQAi009221@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Fri, 20 Mar 2009 17:51:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190164 - head/sys/dev/drm
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Mar 2009 17:51:27 -0000

Author: rnoland
Date: Fri Mar 20 17:51:26 2009
New Revision: 190164
URL: http://svn.freebsd.org/changeset/base/190164

Log:
  Fix what appears to be a typo, and restore the registers correctly.
  
  Found with:	Coverity Prevent(tm)
  CID: 		2454

Modified:
  head/sys/dev/drm/i915_suspend.c

Modified: head/sys/dev/drm/i915_suspend.c
==============================================================================
--- head/sys/dev/drm/i915_suspend.c	Fri Mar 20 17:48:36 2009	(r190163)
+++ head/sys/dev/drm/i915_suspend.c	Fri Mar 20 17:51:26 2009	(r190164)
@@ -515,7 +515,7 @@ int i915_restore_state(struct drm_device
 
 	for (i = 0; i < 16; i++) {
 		I915_WRITE(SWF00 + (i << 2), dev_priv->saveSWF0[i]);
-		I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i+7]);
+		I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i]);
 	}
 	for (i = 0; i < 3; i++)
 		I915_WRITE(SWF30 + (i << 2), dev_priv->saveSWF2[i]);