diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-08-01 08:10:46 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2013-08-07 11:06:26 -0400 |
commit | c66c4cc087eb1f5307f6391e467797227aed758a (patch) | |
tree | 3dd599cd11bc0b3d7bafad2212d55113080c904e /drivers/i2c | |
parent | 3923172b3d700486c1ca24df9c4c5405a83e2309 (diff) |
i2c: add sanity check to i2c_put_adapter
i2c_put_adapter dereferences i2c_adapter pointer passed without check
for NULL. This adds a check for non-NULL pointer to allow i2c_put_adapter
called with NULL and behave the same way i2c_release_client does already.
It allows to simplify drivers where you need to release the adapter
during probe failures.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/i2c-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index f32ca293ae0e..d075df641c2c 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
@@ -1825,7 +1825,8 @@ EXPORT_SYMBOL(i2c_get_adapter); | |||
1825 | 1825 | ||
1826 | void i2c_put_adapter(struct i2c_adapter *adap) | 1826 | void i2c_put_adapter(struct i2c_adapter *adap) |
1827 | { | 1827 | { |
1828 | module_put(adap->owner); | 1828 | if (adap) |
1829 | module_put(adap->owner); | ||
1829 | } | 1830 | } |
1830 | EXPORT_SYMBOL(i2c_put_adapter); | 1831 | EXPORT_SYMBOL(i2c_put_adapter); |
1831 | 1832 | ||