diff options
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0672-w1-ds2413-fix-state-byte-comparision.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0672-w1-ds2413-fix-state-byte-comparision.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0672-w1-ds2413-fix-state-byte-comparision.patch b/target/linux/brcm2708/patches-4.19/950-0672-w1-ds2413-fix-state-byte-comparision.patch new file mode 100644 index 0000000000..5f2f6b4177 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0672-w1-ds2413-fix-state-byte-comparision.patch @@ -0,0 +1,48 @@ +From 2746956dac70aac4adcf9e283678c376ffab80bd Mon Sep 17 00:00:00 2001 +From: Mariusz Bialonczyk <manio@skyboo.net> +Date: Thu, 30 May 2019 09:51:25 +0200 +Subject: [PATCH 672/782] w1: ds2413: fix state byte comparision + +commit aacd152ecd7b18af5d2d96dea9e7284c1c93abea upstream. + +This commit is fixing a smatch warning: +drivers/w1/slaves/w1_ds2413.c:61 state_read() warn: impossible condition '(*buf == 255) => ((-128)-127 == 255)' +by creating additional u8 variable for the bus reading and comparision + +Reported-by: kbuild test robot <lkp@intel.com> +Reported-by: Dan Carpenter <dan.carpenter@oracle.com> +Cc: Dan Carpenter <dan.carpenter@oracle.com> +Fixes: 3856032a0628 ("w1: ds2413: when the slave is not responding during read, select it again") +Signed-off-by: Mariusz Bialonczyk <manio@skyboo.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/w1/slaves/w1_ds2413.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/drivers/w1/slaves/w1_ds2413.c ++++ b/drivers/w1/slaves/w1_ds2413.c +@@ -33,6 +33,7 @@ static ssize_t state_read(struct file *f + struct w1_slave *sl = kobj_to_w1_slave(kobj); + unsigned int retries = W1_F3A_RETRIES; + ssize_t bytes_read = -EIO; ++ u8 state; + + dev_dbg(&sl->dev, + "Reading %s kobj: %p, off: %0#10x, count: %zu, buff addr: %p", +@@ -53,12 +54,13 @@ next: + while (retries--) { + w1_write_8(sl->master, W1_F3A_FUNC_PIO_ACCESS_READ); + +- *buf = w1_read_8(sl->master); +- if ((*buf & 0x0F) == ((~*buf >> 4) & 0x0F)) { ++ state = w1_read_8(sl->master); ++ if ((state & 0x0F) == ((~state >> 4) & 0x0F)) { + /* complement is correct */ ++ *buf = state; + bytes_read = 1; + goto out; +- } else if (*buf == W1_F3A_INVALID_PIO_STATE) { ++ } else if (state == W1_F3A_INVALID_PIO_STATE) { + /* slave didn't respond, try to select it again */ + dev_warn(&sl->dev, "slave device did not respond to PIO_ACCESS_READ, " \ + "reselecting, retries left: %d\n", retries); |