summaryrefslogtreecommitdiff
path: root/keyboards/ergodox/ez/ez.c
diff options
context:
space:
mode:
authorDamien2017-01-26 09:05:55 +0100
committerGitHub2017-01-26 09:05:55 +0100
commitb7b94bfb132aa5f2f79b587fcfa6b1197485db27 (patch)
tree4cae966728b7b6baf101a7ab2b95eeff16cce141 /keyboards/ergodox/ez/ez.c
parentf91f0a715d51286064bfe808b0d463878a6d3588 (diff)
parentaac7c0aa4db6b27f4c8d8f3849f8fd41f07e892a (diff)
Merge pull request #17 from qmk/master
Merged from QMK project
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 039e4c6bb..3e19f2302 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;
}