diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-03-09 03:16:45 -0500 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2013-04-02 01:03:37 -0400 |
commit | f5fb0822957b914ab7022cc4bfe000ec3bc9c82c (patch) | |
tree | 394d69bc7cfa47836e3db0152c54b886108a77bb | |
parent | 19baba4cb6843bbe3dfde87e1e913f6a9cd27da9 (diff) |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index f7cd05b4f327..e4fe4940fd82 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) | |||
1231 | if (found != adap) { | 1231 | if (found != adap) { |
1232 | pr_debug("i2c-core: attempting to delete unregistered " | 1232 | pr_debug("i2c-core: attempting to delete unregistered " |
1233 | "adapter [%s]\n", adap->name); | 1233 | "adapter [%s]\n", adap->name); |
1234 | return -EINVAL; | 1234 | return 0; |
1235 | } | 1235 | } |
1236 | 1236 | ||
1237 | /* Tell drivers about this removal */ | 1237 | /* Tell drivers about this removal */ |