Skip to content

Fix i2c_smbus_read_i2c_block_data return value check #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
illiav-j wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix i2c_smbus_read_i2c_block_data return value check #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/vr_update_mps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ bool vr_update_mps::crcCheckSum(){
}

ret = i2c_smbus_read_i2c_block_data(fd, CRC_ADDR, BYTE_COUNT_4, rdata);
if (rdata < SUCCESS)
if (ret < SUCCESS)
{
sd_journal_print(LOG_ERR, "Error: Reading CRC from device failed\n");
return false;
Expand Down Expand Up @@ -80,7 +80,7 @@ bool vr_update_mps::isUpdatable(){

ret = i2c_smbus_read_i2c_block_data(fd, DEVICE_ID_REG, BYTE_COUNT_2, rdata);

if(rdata >= SUCCESS)
if(ret >= SUCCESS)
{
VrDeviceId = (rdata[INDEX_0] << SHIFT_8) | rdata[INDEX_1];
}
Expand All @@ -92,7 +92,7 @@ bool vr_update_mps::isUpdatable(){

ret = i2c_smbus_read_i2c_block_data(fd, CONFIG_ID_REG, BYTE_COUNT_3, rdata);

if(rdata >= SUCCESS)
if(ret >= SUCCESS)
{
VrConfigId = (rdata[INDEX_0] << SHIFT_16) | (rdata[INDEX_1] << SHIFT_8) | rdata[INDEX_2];
}
Expand Down
4 changes: 2 additions & 2 deletions src/vr_update_mps285x.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ bool vr_update_mps285x::isUpdatable()
/*Device ID ID from 9Ah@page0*/
ret = i2c_smbus_read_i2c_block_data(fd, DEVICE_ID_REG, BYTE_COUNT_4, rdata);

if(rdata >= SUCCESS)
if(ret >= SUCCESS)
{
VrDeviceId = ((uint16_t)rdata[INDEX_2] << SHIFT_8) | rdata[INDEX_1];
}
Expand All @@ -66,7 +66,7 @@ bool vr_update_mps285x::isUpdatable()
/*Config ID from 9Dh@page0*/
ret = i2c_smbus_read_i2c_block_data(fd, CONFIG_ID_REG, BYTE_COUNT_4, rdata);

if(rdata >= SUCCESS)
if(ret >= SUCCESS)
{
VrConfigId = ((uint16_t)rdata[INDEX_2] << SHIFT_8) | rdata[INDEX_1];
}
Expand Down