diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-10 12:09:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-10 12:09:13 -0700 |
| commit | 2f7043a37708110aa98262b91702da6bc32e17b6 (patch) | |
| tree | de0525dae8420a56f9a00def631ccc0108d9d091 /drivers/i2c/i2c-core-base.c | |
| parent | 4d9fbf539b52810cd2903719b181ed3d3ccd861f (diff) | |
| parent | 26273939ace935dd7553b31d279eab30b40f7b9a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'drivers/i2c/i2c-core-base.c')
| -rw-r--r-- | drivers/i2c/i2c-core-base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index c89dac7fd2e7..12822a4b8f8f 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -357,6 +357,7 @@ static int i2c_device_probe(struct device *dev) * Tree match table entry is supplied for the probing device. */ if (!driver->id_table && + !i2c_acpi_match_device(dev->driver->acpi_match_table, client) && !i2c_of_match_device(dev->driver->of_match_table, client)) return -ENODEV; |