aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2007-12-13 17:53:08 -0500
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2007-12-26 12:15:14 -0500
commit54b2c8f93d7c3ddc04b55666b878fec437d32983 (patch)
treefc7d622fcd920e98178bdf8099b4f8728b827259
parent393852ecfeec575ac78216b0eb58e4fd92f0816c (diff)
UBI: silence a warning
This patch silences the following warning : drivers/mtd/ubi/vmt.c:73: warning: 'ret' may be used uninitialized in this function gcc can't see that we always initialize ret in all situations where it is actually used. The one case where it's not initialized is when we BUG(), but gcc doesn't know that we won't then continue and use an uninitialized 'ret'. This patch results in code that does exactely the same as before, but it also makes gcc shut up, so we generate one less line of warning noise. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--drivers/mtd/ubi/vmt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 88629a320c2b..e44948de7dd9 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -70,13 +70,14 @@ static struct device_attribute attr_vol_upd_marker =
70static ssize_t vol_attribute_show(struct device *dev, 70static ssize_t vol_attribute_show(struct device *dev,
71 struct device_attribute *attr, char *buf) 71 struct device_attribute *attr, char *buf)
72{ 72{
73 int ret; 73 int ret = -ENODEV;
74
74 struct ubi_volume *vol = container_of(dev, struct ubi_volume, dev); 75 struct ubi_volume *vol = container_of(dev, struct ubi_volume, dev);
75 76
76 spin_lock(&vol->ubi->volumes_lock); 77 spin_lock(&vol->ubi->volumes_lock);
77 if (vol->removed) { 78 if (vol->removed) {
78 spin_unlock(&vol->ubi->volumes_lock); 79 spin_unlock(&vol->ubi->volumes_lock);
79 return -ENODEV; 80 return ret;
80 } 81 }
81 if (attr == &attr_vol_reserved_ebs) 82 if (attr == &attr_vol_reserved_ebs)
82 ret = sprintf(buf, "%d\n", vol->reserved_pebs); 83 ret = sprintf(buf, "%d\n", vol->reserved_pebs);