diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-10 22:56:15 +0200 |
|---|---|---|
| committer | Jean Delvare <khali@mahadeva.delvare> | 2008-08-10 22:56:15 +0200 |
| commit | b25b791b13aaa336b56c4f9bd417ff126363f80b (patch) | |
| tree | c19dd8eaaca361bd77b0324ccf736eac5159aa29 | |
| parent | 399d6b26539d83dd734746dc2292d53fbc5807b2 (diff) | |
| download | blackbird-op-linux-b25b791b13aaa336b56c4f9bd417ff126363f80b.tar.gz blackbird-op-linux-b25b791b13aaa336b56c4f9bd417ff126363f80b.zip | |
i2c: Fix NULL pointer dereference in i2c_new_probed_device
Fix a NULL pointer dereference that happened when calling
i2c_new_probed_device on one of the addresses for which we use byte
reads instead of quick write for detection purpose (that is: 0x30-0x37
and 0x50-0x5f).
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
| -rw-r--r-- | drivers/i2c/i2c-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 7bf38c418086..c16dcad94412 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1451,9 +1451,11 @@ i2c_new_probed_device(struct i2c_adapter *adap, if ((addr_list[i] & ~0x07) == 0x30 || (addr_list[i] & ~0x0f) == 0x50 || !i2c_check_functionality(adap, I2C_FUNC_SMBUS_QUICK)) { + union i2c_smbus_data data; + if (i2c_smbus_xfer(adap, addr_list[i], 0, I2C_SMBUS_READ, 0, - I2C_SMBUS_BYTE, NULL) >= 0) + I2C_SMBUS_BYTE, &data) >= 0) break; } else { if (i2c_smbus_xfer(adap, addr_list[i], 0, |
