From: Jeff Mahoney <jeffm@suse.com>
Date: Fri, 6 May 2016 18:02:54 +0000 (+0200)
Subject: lightnvm: fix "warning: ‘ret’ may be used uninitialized"
X-Git-Tag: v4.7-rc1~156^2~27
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=57aac2f1be4a0711b7f24f7d367e8672ebaa3844;p=linux-2.6-block.git

lightnvm: fix "warning: ‘ret’ may be used uninitialized"

This fixes the following warnings:
drivers/lightnvm/sysblk.c:125:9: warning: ‘ret’ may be used
uninitialized in this function

drivers/lightnvm/sysblk.c:275:15: warning: ‘ret’ may be used
uninitialized in this function

In both cases, ret is only set from within a loop that may not be entered.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/lightnvm/sysblk.c b/drivers/lightnvm/sysblk.c
index 321de1f154c5..b1e1404e6951 100644
--- a/drivers/lightnvm/sysblk.c
+++ b/drivers/lightnvm/sysblk.c
@@ -122,7 +122,7 @@ static int nvm_get_all_sysblks(struct nvm_dev *dev, struct sysblk_scan *s,
 				struct ppa_addr *ppas, nvm_bb_update_fn *fn)
 {
 	struct ppa_addr dppa;
-	int i, ret;
+	int i, ret = 0;
 
 	s->nr_ppas = 0;
 
@@ -272,7 +272,7 @@ static int nvm_write_and_verify(struct nvm_dev *dev, struct nvm_sb_info *info,
 {
 	struct nvm_system_block nvmsb;
 	void *buf;
-	int i, sect, ret, bufsz;
+	int i, sect, ret = 0, bufsz;
 	struct ppa_addr *ppas;
 
 	nvm_cpu_to_sysblk(&nvmsb, info);