| From fb1abce1e47692c426fbbea05e06eb2fa3cd66eb Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 6 May 2021 07:38:56 +0200 |
| Subject: media: rc: i2c: Fix an error message |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit 9c87ae1a0dbeb5794957421157fd266d38a869b4 ] |
| |
| 'ret' is known to be 1 here. In fact 'i' is expected instead. |
| Store the return value of 'i2c_master_recv()' in 'ret' so that the error |
| message print the correct error code. |
| |
| Fixes: acaa34bf06e9 ("media: rc: implement zilog transmitter") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Signed-off-by: Sean Young <sean@mess.org> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/i2c/ir-kbd-i2c.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c |
| index e8119ad0bc71..92376592455e 100644 |
| --- a/drivers/media/i2c/ir-kbd-i2c.c |
| +++ b/drivers/media/i2c/ir-kbd-i2c.c |
| @@ -678,8 +678,8 @@ static int zilog_tx(struct rc_dev *rcdev, unsigned int *txbuf, |
| goto out_unlock; |
| } |
| |
| - i = i2c_master_recv(ir->tx_c, buf, 1); |
| - if (i != 1) { |
| + ret = i2c_master_recv(ir->tx_c, buf, 1); |
| + if (ret != 1) { |
| dev_err(&ir->rc->dev, "i2c_master_recv failed with %d\n", ret); |
| ret = -EIO; |
| goto out_unlock; |
| -- |
| 2.30.2 |
| |
