summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy <naddy@openbsd.org>2017-07-03 13:26:04 +0000
committernaddy <naddy@openbsd.org>2017-07-03 13:26:04 +0000
commit50cc059d3817d37129d2e650d0c3ea72244032f8 (patch)
treee00261f27d454500c25065f02b3bae2fd93deda7
parentChange previous to not wait for both process exit and pty close - (diff)
downloadwireguard-openbsd-50cc059d3817d37129d2e650d0c3ea72244032f8.tar.xz
wireguard-openbsd-50cc059d3817d37129d2e650d0c3ea72244032f8.zip
merge error, revealed by clang; ok kettenis@
-rw-r--r--sys/dev/pci/drm/i915/intel_i2c.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/intel_i2c.c b/sys/dev/pci/drm/i915/intel_i2c.c
index 86760e2105d..c75fe66b70a 100644
--- a/sys/dev/pci/drm/i915/intel_i2c.c
+++ b/sys/dev/pci/drm/i915/intel_i2c.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intel_i2c.c,v 1.10 2017/07/01 16:14:10 kettenis Exp $ */
+/* $OpenBSD: intel_i2c.c,v 1.11 2017/07/03 13:26:04 naddy Exp $ */
/*
* Copyright (c) 2012, 2013 Mark Kettenis <kettenis@openbsd.org>
*
@@ -457,7 +457,7 @@ intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit)
else
bus->force_bit--;
- KASSERT(force_bit >= 0);
+ KASSERT(bus->force_bit >= 0);
if (bus->force_bit)
bus->adapter.ic.ic_exec = NULL;