Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 151034
b: refs/heads/master
c: c52cf01
h: refs/heads/master
v: v3
  • Loading branch information
Jean Delvare committed Jun 15, 2009
1 parent 2a75575 commit 39a528e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fa1b2ca4fa271f9300a764b9d505a027156f749b
refs/heads/master: c52cf01f5b35d77b2a918c319e22567de5c3c15f
11 changes: 0 additions & 11 deletions trunk/drivers/i2c/i2c-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <linux/i2c.h>
#include <linux/init.h>
#include <linux/idr.h>
#include <linux/platform_device.h>
#include <linux/mutex.h>
#include <linux/completion.h>
#include <linux/hardirq.h>
Expand Down Expand Up @@ -451,16 +450,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)

mutex_lock(&core_lock);

/* Add the adapter to the driver core.
* If the parent pointer is not set up,
* we add this adapter to the host bus.
*/
if (adap->dev.parent == NULL) {
adap->dev.parent = &platform_bus;
pr_debug("I2C adapter driver [%s] forgot to specify "
"physical device\n", adap->name);
}

/* Set default timeout to 1 second if not already set */
if (adap->timeout == 0)
adap->timeout = HZ;
Expand Down

0 comments on commit 39a528e

Please sign in to comment.