summaryrefslogtreecommitdiff
path: root/keyboards/ergodox/ez/ez.c
diff options
context:
space:
mode:
authorStanley Lai <stanleylai.sg@gmail.com>2017-02-13 12:36:22 -0800
committerStanley Lai <stanleylai.sg@gmail.com>2017-02-13 12:36:22 -0800
commita8eba1bddaf55224939a86bfa4d8e1b53e1d82db (patch)
tree906568677ed027a807d5e9c0c1bc1c2ae001f0f6 /keyboards/ergodox/ez/ez.c
parent53ea854462c0b3b2c3c58a36b714ac02f773c74f (diff)
parentfd2925efbac0d7963f3d267dd5264f08a0a4e9dc (diff)
Merge remote-tracking branch 'refs/remotes/qmk/master'
Diffstat (limited to 'keyboards/ergodox/ez/ez.c')
-rw-r--r--keyboards/ergodox/ez/ez.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox/ez/ez.c
index 039e4c6bb1..3e19f23028 100644
--- a/keyboards/ergodox/ez/ez.c
+++ b/keyboards/ergodox/ez/ez.c
@@ -52,9 +52,9 @@ uint8_t init_mcp23018(void) {
// I2C subsystem
- uint8_t sreg_prev;
- sreg_prev=SREG;
- cli();
+ // uint8_t sreg_prev;
+ // sreg_prev=SREG;
+ // cli();
if (i2c_initialized == 0) {
i2c_init(); // on pins D(1,0)
i2c_initialized++;
@@ -83,7 +83,7 @@ uint8_t init_mcp23018(void) {
out:
i2c_stop();
- SREG=sreg_prev;
+ // SREG=sreg_prev;
return mcp23018_status;
}