Skip to content

Commit

Permalink
i2c: i2c_del_adapter: Don't treat removing a non-registered adapter a…
Browse files Browse the repository at this point in the history
…s error

Currently i2c_del_adapter() returns -EINVAL when it gets an adapter which is not
registered. But none of the users of i2c_del_adapter() depend on this behavior,
so for the sake of being able to sanitize the return type of i2c_del_adapter
argue, that the purpose of i2c_del_adapter() is to remove an I2C adapter from
the system. If the adapter is not registered in the first place this becomes a
no-op. So we can return success without having to do anything.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  • Loading branch information
Lars-Peter Clausen authored and Wolfram Sang committed Apr 2, 2013
1 parent 19baba4 commit f5fb082
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/i2c/i2c-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
if (found != adap) {
pr_debug("i2c-core: attempting to delete unregistered "
"adapter [%s]\n", adap->name);
return -EINVAL;
return 0;
}

/* Tell drivers about this removal */
Expand Down

0 comments on commit f5fb082

Please sign in to comment.