Author: rnoland
Date: Tue Jun 23 15:52:08 2009
New Revision: 194723
URL: http://svn.freebsd.org/changeset/base/194723
Log:
Merge 190164 from HEAD
Fix what appears to be a typo, and restore the registers correctly.
Found with: Coverity Prevent(tm)
CID: 2454
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/drm/i915_suspend.c
Modified: stable/7/sys/dev/drm/i915_suspend.c
==============================================================================
--- stable/7/sys/dev/drm/i915_suspend.c Tue Jun 23 15:50:48 2009
(r194722)
+++ stable/7/sys/dev/drm/i915_suspend.c Tue Jun 23 15:52:08 2009
(r194723)
@@ -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]);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
