From aa065f0a0544526a4e1b3e4ccb5f326dc842569a Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 24 Feb 2020 09:07:02 -0700
Subject: [PATCH] Fix double setting of low keyboard outputs

---
 src/board/system76/darp5/kbscan.c   | 2 +-
 src/board/system76/galp3-c/kbscan.c | 2 +-
 src/board/system76/lemp9/kbscan.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/board/system76/darp5/kbscan.c b/src/board/system76/darp5/kbscan.c
index 0257d89..8087b0e 100644
--- a/src/board/system76/darp5/kbscan.c
+++ b/src/board/system76/darp5/kbscan.c
@@ -138,8 +138,8 @@ void kbscan_event(void) {
     for (i = 0; i < KM_OUT; i++) {
         // Set current line as output
         if (i < 8) {
-            KSOLGOEN = 0;
             KSOLGOEN = 1 << i;
+            KSOHGOEN = 0;
             GPCRC3 = GPIO_IN;
             GPCRC5 = GPIO_IN;
         } else if (i < 16) {
diff --git a/src/board/system76/galp3-c/kbscan.c b/src/board/system76/galp3-c/kbscan.c
index f19e54e..68e2c86 100644
--- a/src/board/system76/galp3-c/kbscan.c
+++ b/src/board/system76/galp3-c/kbscan.c
@@ -146,8 +146,8 @@ void kbscan_event(void) {
     for (i = 0; i < KM_OUT; i++) {
         // Set current line as output
         if (i < 8) {
-            KSOLGOEN = 0;
             KSOLGOEN = 1 << i;
+            KSOHGOEN = 0;
         } else if (i < 16) {
             KSOLGOEN = 0;
             KSOHGOEN = 1 << (i - 8);
diff --git a/src/board/system76/lemp9/kbscan.c b/src/board/system76/lemp9/kbscan.c
index f19e54e..68e2c86 100644
--- a/src/board/system76/lemp9/kbscan.c
+++ b/src/board/system76/lemp9/kbscan.c
@@ -146,8 +146,8 @@ void kbscan_event(void) {
     for (i = 0; i < KM_OUT; i++) {
         // Set current line as output
         if (i < 8) {
-            KSOLGOEN = 0;
             KSOLGOEN = 1 << i;
+            KSOHGOEN = 0;
         } else if (i < 16) {
             KSOLGOEN = 0;
             KSOHGOEN = 1 << (i - 8);