Commit a73b6a3b authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman

ics932s401: fix broken handling of errors when word reading fails

In commit b05ae01f, someone tried to make the driver handle i2c read
errors by simply zeroing out the register contents, but for some reason
left unaltered the code that sets the cached register value the function
call return value.

The original patch was authored by a member of the Underhanded
Mangle-happy Nerds, I'm not terribly surprised.  I don't have the
hardware anymore so I can't test this, but it seems like a pretty
obvious API usage fix to me...

Fixes: b05ae01f ("misc/ics932s401: Add a missing check to i2c_smbus_read_word_data")
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20210428222534.GJ3122264@magnolia
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba2b062f
...@@ -134,7 +134,7 @@ static struct ics932s401_data *ics932s401_update_device(struct device *dev) ...@@ -134,7 +134,7 @@ static struct ics932s401_data *ics932s401_update_device(struct device *dev)
for (i = 0; i < NUM_MIRRORED_REGS; i++) { for (i = 0; i < NUM_MIRRORED_REGS; i++) {
temp = i2c_smbus_read_word_data(client, regs_to_copy[i]); temp = i2c_smbus_read_word_data(client, regs_to_copy[i]);
if (temp < 0) if (temp < 0)
data->regs[regs_to_copy[i]] = 0; temp = 0;
data->regs[regs_to_copy[i]] = temp >> 8; data->regs[regs_to_copy[i]] = temp >> 8;
} }
......
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