Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36110
b: refs/heads/master
c: 114fd18
h: refs/heads/master
v: v3
  • Loading branch information
Jean Delvare authored and Greg Kroah-Hartman committed Sep 26, 2006
1 parent 049ed25 commit 9e1b2d6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 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: 7eff82c8b1511017ae605f0c99ac275a7e21b867
refs/heads/master: 114fd18397eb0eacf51ac784f7d5c929b8499715
9 changes: 7 additions & 2 deletions trunk/drivers/i2c/i2c-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -707,11 +707,16 @@ static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,

/* Finally call the custom detection function */
err = found_proc(adapter, addr, kind);

/* -ENODEV can be returned if there is a chip at the given address
but it isn't supported by this chip driver. We catch it here as
this isn't an error. */
return (err == -ENODEV) ? 0 : err;
if (err == -ENODEV)
err = 0;

if (err)
dev_warn(&adapter->dev, "Client creation failed at 0x%x (%d)\n",
addr, err);
return err;
}

int i2c_probe(struct i2c_adapter *adapter,
Expand Down

0 comments on commit 9e1b2d6

Please sign in to comment.