diff options
author | David Olsson <david.olsson@softhouse.se> | 2017-02-11 10:50:37 +0100 |
---|---|---|
committer | David Olsson <david.olsson@softhouse.se> | 2017-02-11 10:50:37 +0100 |
commit | 052f81aacaa3b5afa93f9db3667f31f9365348ce (patch) | |
tree | dcfde5c6fed00e248535ac4d975831f33316cc8a /keyboards/ergodox/ez/ez.c | |
parent | aa69337cf563d7b37722aabfcd1c5bae6c185208 (diff) | |
parent | 835556da9111d91b71c545d6a273e843f07631ae (diff) |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/ergodox/ez/ez.c')
-rw-r--r-- | keyboards/ergodox/ez/ez.c | 8 |
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; } |