summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-01 11:07:40 -0700
committerSeung-Woo Kim <sw0312.kim@samsung.com>2019-12-31 13:50:58 +0900
commitb1c8a207739cd48001726943b10b9ac21d05dcb8 (patch)
tree6adad126de743926a0b7c67dd908ba10053dc6ad
parentfd1078519e04e5c3cc40c08287c7d98b95908a05 (diff)
downloadlinux-rpi3-b1c8a207739cd48001726943b10b9ac21d05dcb8.tar.gz
linux-rpi3-b1c8a207739cd48001726943b10b9ac21d05dcb8.tar.bz2
linux-rpi3-b1c8a207739cd48001726943b10b9ac21d05dcb8.zip
gcc-9: don't warn about uninitialized variable
commit cf676908846a06443fa5e6724ca3f5dd7460eca1 upstream. I'm not sure what made gcc warn about this code now. The 'ret' variable does end up initialized in all cases, but it's definitely not obvious, so the compiler is quite reasonable to warn about this. So just add initialization to make it all much more obvious both to compilers and to humans. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [sw0312.kim: cherry-pick from stable linux-4.19.y commit a152a7b411a5 for gcc 9 build] Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Change-Id: I9ffd18114904d32ebb631680c7ac40d9771771c2
-rw-r--r--drivers/i2c/i2c-core-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 5b0e1d9e5adc..1de10e5c70d7 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -185,7 +185,7 @@ static int i2c_generic_bus_free(struct i2c_adapter *adap)
int i2c_generic_scl_recovery(struct i2c_adapter *adap)
{
struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
- int i = 0, scl = 1, ret;
+ int i = 0, scl = 1, ret = 0;
if (bri->prepare_recovery)
bri->prepare_recovery(adap);