Skip to content

Driver i2c_imx: Fix system fault when there is no data to send #30169

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

Merged
merged 2 commits into from
Nov 30, 2020
Merged

Driver i2c_imx: Fix system fault when there is no data to send #30169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13b940c
i2c_imx: Fix system fault when there is no data to send
anthonytex Nov 20, 2020
1369790
Driver i2c_imx: changed read and write transmission size type
anthonytex Nov 28, 2020
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
19 changes: 9 additions & 10 deletions drivers/i2c/i2c_imx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct i2c_imx_data {
};

static bool i2c_imx_write(const struct device *dev, uint8_t *txBuffer,
uint8_t txSize)
uint32_t txSize)
{
I2C_Type *base = DEV_BASE(dev);
struct i2c_imx_data *data = DEV_DATA(dev);
Expand Down Expand Up @@ -82,7 +82,7 @@ static bool i2c_imx_write(const struct device *dev, uint8_t *txBuffer,
}

static void i2c_imx_read(const struct device *dev, uint8_t *rxBuffer,
uint8_t rxSize)
uint32_t rxSize)
{
I2C_Type *base = DEV_BASE(dev);
struct i2c_imx_data *data = DEV_DATA(dev);
Expand Down Expand Up @@ -191,7 +191,6 @@ static int i2c_imx_transfer(const struct device *dev, struct i2c_msg *msgs,
I2C_Type *base = DEV_BASE(dev);
struct i2c_imx_data *data = DEV_DATA(dev);
struct i2c_master_transfer *transfer = &data->transfer;
uint8_t *buf, *buf_end;
uint16_t timeout = UINT16_MAX;
int result = -EIO;

Expand Down Expand Up @@ -233,13 +232,13 @@ static int i2c_imx_transfer(const struct device *dev, struct i2c_msg *msgs,
}

/* Transfer data */
buf = msgs->buf;
buf_end = buf + msgs->len;
if ((msgs->flags & I2C_MSG_RW_MASK) == I2C_MSG_READ) {
i2c_imx_read(dev, msgs->buf, msgs->len);
} else {
if (!i2c_imx_write(dev, msgs->buf, msgs->len)) {
goto finish; /* No ACK received */
if (msgs->len) {
if ((msgs->flags & I2C_MSG_RW_MASK) == I2C_MSG_READ) {
i2c_imx_read(dev, msgs->buf, msgs->len);
} else {
if (!i2c_imx_write(dev, msgs->buf, msgs->len)) {
goto finish; /* No ACK received */
}
}
}

Expand Down