revert previous changes to enable dwiic on Dell precision as it seems

to cause issues on Dell XPS 15 9560. Will investigate and recommit later
if a better fix can be found.

diff --git a/sys/dev/i2c/ihidev.c b/sys/dev/i2c/ihidev.c
index 148c145..b1c6b8d 100644 (file)
--- a/sys/dev/i2c/ihidev.c
+++ b/sys/dev/i2c/ihidev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ihidev.c,v 1.15 2018/01/08 08:14:00 mlarkin Exp $ */
+/* $OpenBSD: ihidev.c,v 1.16 2018/01/12 08:11:47 mlarkin Exp $ */
 /*
  * HID-over-i2c driver
  *
@@ -604,7 +604,7 @@ ihidev_intr(void *arg)
         * than or equal to wMaxInputLength
         */
        psize = sc->sc_ibuf[0] | sc->sc_ibuf[1] << 8;
-       if (psize < 3 || psize > sc->sc_isize) {
+       if (!psize || psize > sc->sc_isize) {
                if (sc->sc_poll) {
                        /*
                         * TODO: all fingers are up, should we pass to hid

diff --git a/sys/dev/pci/dwiic_pci.c b/sys/dev/pci/dwiic_pci.c
index 4af4c2f..19c74a8 100644 (file)
--- a/sys/dev/pci/dwiic_pci.c
+++ b/sys/dev/pci/dwiic_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwiic_pci.c,v 1.2 2018/01/08 08:14:00 mlarkin Exp $ */
+/* $OpenBSD: dwiic_pci.c,v 1.3 2018/01/12 08:11:48 mlarkin Exp $ */
 /*
  * Synopsys DesignWare I2C controller
  * PCI attachment
@@ -62,8 +62,6 @@ struct cfattach dwiic_pci_ca = {
 const struct pci_matchid dwiic_pci_ids[] = {
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_LP_I2C_1 },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_LP_I2C_2 },
-       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_I2C0 },
-       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_I2C1 },
 };
 
 int