diff options
| author | Joshua Stein <jcs@cvs.openbsd.org> | 2016-09-07 15:31:42 +0000 |
|---|---|---|
| committer | Joshua Stein <jcs@cvs.openbsd.org> | 2016-09-07 15:31:42 +0000 |
| commit | 6e8d132d1d83df04c72d6178bb403acf892a172a (patch) | |
| tree | 1e5dde08518696b56f254b040b263f262ddea5b0 /sys/dev | |
| parent | 0b1bfafa156e6bfbd4d4467c2ccdee7ca3d4e009 (diff) | |
revert part of 1.18 which caused a regression with at least one ikbd
device
reported by Callum R. Davies
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/dwiic.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/acpi/dwiic.c b/sys/dev/acpi/dwiic.c index dcabdefa5a4..175691c6f47 100644 --- a/sys/dev/acpi/dwiic.c +++ b/sys/dev/acpi/dwiic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwiic.c,v 1.20 2016/09/01 10:04:51 jcs Exp $ */ +/* $OpenBSD: dwiic.c,v 1.21 2016/09/07 15:31:41 jcs Exp $ */ /* * Synopsys DesignWare I2C controller * @@ -985,9 +985,6 @@ dwiic_i2c_exec(void *cookie, i2c_op_t op, i2c_addr_t addr, const void *cmdbuf, sc->sc_i2c_xfer.error = 1; sc->sc_busy = 0; - /* disable controller */ - dwiic_enable(sc, 0); - return (1); } @@ -1014,9 +1011,6 @@ dwiic_i2c_exec(void *cookie, i2c_op_t op, i2c_addr_t addr, const void *cmdbuf, } } - /* disable controller */ - dwiic_enable(sc, 0); - sc->sc_busy = 0; return 0; |