Commit b25b791b authored by Hans Verkuil's avatar Hans Verkuil Committed by Jean Delvare

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 399d6b26
...@@ -1451,9 +1451,11 @@ i2c_new_probed_device(struct i2c_adapter *adap, ...@@ -1451,9 +1451,11 @@ i2c_new_probed_device(struct i2c_adapter *adap,
if ((addr_list[i] & ~0x07) == 0x30 if ((addr_list[i] & ~0x07) == 0x30
|| (addr_list[i] & ~0x0f) == 0x50 || (addr_list[i] & ~0x0f) == 0x50
|| !i2c_check_functionality(adap, I2C_FUNC_SMBUS_QUICK)) { || !i2c_check_functionality(adap, I2C_FUNC_SMBUS_QUICK)) {
union i2c_smbus_data data;
if (i2c_smbus_xfer(adap, addr_list[i], 0, if (i2c_smbus_xfer(adap, addr_list[i], 0,
I2C_SMBUS_READ, 0, I2C_SMBUS_READ, 0,
I2C_SMBUS_BYTE, NULL) >= 0) I2C_SMBUS_BYTE, &data) >= 0)
break; break;
} else { } else {
if (i2c_smbus_xfer(adap, addr_list[i], 0, if (i2c_smbus_xfer(adap, addr_list[i], 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment