Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:29:20 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_uncore.c
Log Message:
Fix multiple typos in merge attepmt.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.7 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c Mon Aug 27 07:29:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_uncore.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: intel_uncore.c,v 1.8 2018/08/27 07:29:20 riastradh Exp $ */
/*
* Copyright © 2013 Intel Corporation
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.8 2018/08/27 07:29:20 riastradh Exp $");
#include "i915_drv.h"
#include "intel_drv.h"
@@ -1299,9 +1299,9 @@ void intel_uncore_destroy(struct drm_dev
struct drm_i915_private *const dev_priv = dev->dev_private;
unsigned i;
- for (i = 0; i < FW_DOMAIN_ID_COUNT) {
+ for (i = 0; i < FW_DOMAIN_ID_COUNT; i++) {
if (dev_priv->uncore.fw_domains & (1u << i))
- teardown_timer(&dev_priv->uncore.fw_domwin[i].timer);
+ teardown_timer(&dev_priv->uncore.fw_domain[i].timer);
}
#endif
}
