diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-12-31 09:58:07 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-12-31 09:58:07 +0100 |
| commit | 639136d2a70ab9837befb22ad5b3d67cb4db2216 (patch) | |
| tree | 64e7d426cf7b7ffdce6798986c63dcdfe025c53d /drivers/i2c/busses | |
| parent | 017fc4f6f4b7b70e443e7ef673732517ece111c8 (diff) | |
| parent | ac5b85de17cb96445c51bd1a1c53c3f675582f26 (diff) | |
| download | linux-next-639136d2a70ab9837befb22ad5b3d67cb4db2216.tar.gz | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.16
"A couple of patches this time. Just some more compatibles for the
pca954x driver and an error handling tweak for the reg driver."
Diffstat (limited to 'drivers/i2c/busses')
| -rw-r--r-- | drivers/i2c/busses/i2c-i801.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 9e12a53ef7b8..8eac00efadc1 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1617,6 +1617,9 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) /* Default timeout in interrupt mode: 200 ms */ priv->adapter.timeout = HZ / 5; + if (dev->irq == IRQ_NOTCONNECTED) + priv->features &= ~FEATURE_IRQ; + if (priv->features & FEATURE_IRQ) { u16 pcictl, pcists; |