summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-03-09 08:16:45 +0000
committerWolfram Sang <wsa@the-dreams.de>2013-04-02 07:03:37 +0200
commitf5fb0822957b914ab7022cc4bfe000ec3bc9c82c (patch)
tree394d69bc7cfa47836e3db0152c54b886108a77bb
parent19baba4cb6843bbe3dfde87e1e913f6a9cd27da9 (diff)
downloadop-kernel-dev-f5fb0822957b914ab7022cc4bfe000ec3bc9c82c.zip
op-kernel-dev-f5fb0822957b914ab7022cc4bfe000ec3bc9c82c.tar.gz
i2c: i2c_del_adapter: Don't treat removing a non-registered adapter as 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>
-rw-r--r--drivers/i2c/i2c-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index f7cd05b..e4fe494 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -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 */
OpenPOWER on IntegriCloud