kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "i2c: core: make it possible to match a pure device tree driver"

Browse source 
This reverts commit c80f52847c.
Regressions have been found and also run time based instantiation would
fail. We need more thoughts on this.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang 2013-06-18 18:02:45 +02:00
parent d15b85755b
commit 661f6c1cd9
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/i2c/i2c-core.c
View file

@ -240,7 +240,7 @@ static int i2c_device_probe(struct device *dev)
return 0; return 0;
driver = to_i2c_driver(dev->driver); driver = to_i2c_driver(dev->driver);
if (!driver->probe || (!driver->id_table && !dev->driver->of_match_table)) if (!driver->probe || !driver->id_table)
return -ENODEV; return -ENODEV;
client->driver = driver; client->driver = driver;
if (!device_can_wakeup(&client->dev)) if (!device_can_wakeup(&client->dev))
@ -248,12 +248,7 @@ static int i2c_device_probe(struct device *dev)
client->flags & I2C_CLIENT_WAKE); client->flags & I2C_CLIENT_WAKE);
dev_dbg(dev, "probe\n"); dev_dbg(dev, "probe\n");
if (of_match_device(dev->driver->of_match_table, dev)) status = driver->probe(client, i2c_match_id(driver->id_table, client));
/* Device tree matching */
status = driver->probe(client, NULL);
else
/* Fall back to matching the id_table */
status = driver->probe(client, i2c_match_id(driver->id_table, client));
if (status) { if (status) {
client->driver = NULL; client->driver = NULL;
i2c_set_clientdata(client, NULL); i2c_set_clientdata(client, NULL);