hwmon: (applesmc) Silence uninitialized warnings
authorHenrik Rydberg <rydberg@euromail.se>
Thu, 26 Jan 2012 11:08:41 +0000 (06:08 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Oct 2013 14:00:40 +0000 (07:00 -0700)
commit 0fc86eca1b338d06ec500b34ef7def79c32b602b upstream.

Some error paths do not set a result, leading to the (false)
assumption that the value may be used uninitialized. Set results for
those paths as well.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hwmon/applesmc.c

index 6218d08066ead20ea677304fa232e878790b9668..30cac58422b719401a611b0471268f918b1cf720 100644 (file)
@@ -344,8 +344,10 @@ static int applesmc_get_lower_bound(unsigned int *lo, const char *key)
        while (begin != end) {
                int middle = begin + (end - begin) / 2;
                entry = applesmc_get_entry_by_index(middle);
-               if (IS_ERR(entry))
+               if (IS_ERR(entry)) {
+                       *lo = 0;
                        return PTR_ERR(entry);
+               }
                if (strcmp(entry->key, key) < 0)
                        begin = middle + 1;
                else
@@ -364,8 +366,10 @@ static int applesmc_get_upper_bound(unsigned int *hi, const char *key)
        while (begin != end) {
                int middle = begin + (end - begin) / 2;
                entry = applesmc_get_entry_by_index(middle);
-               if (IS_ERR(entry))
+               if (IS_ERR(entry)) {
+                       *hi = smcreg.key_count;
                        return PTR_ERR(entry);
+               }
                if (strcmp(key, entry->key) < 0)
                        end = middle;
                else