git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
i2c
/
ir-kbd-i2c.c
diff --git
a/drivers/media/i2c/ir-kbd-i2c.c
b/drivers/media/i2c/ir-kbd-i2c.c
index e8119ad0bc71dc38de4c719a121034e357e2c3d9..92376592455eebf2f8c0eb56a23e991e8944c255 100644
(file)
--- 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;