[PATCH] applesmc: Silence uninitialized warnings

[PATCH] applesmc: Silence uninitialized warnings

[Henrik Rydberg]

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>
---
 drivers/hwmon/applesmc.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index b989553..11f79bb 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -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
-- 
1.7.8.4

Re: [PATCH] applesmc: Silence uninitialized warnings

[Guenter Roeck]

On Thu, 2012-01-26 at 06:08 -0500, Henrik Rydberg wrote:
> 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>
> ---
>  drivers/hwmon/applesmc.c |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
> index b989553..11f79bb 100644
> --- a/drivers/hwmon/applesmc.c
> +++ b/drivers/hwmon/applesmc.c
> @@ -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

That was an annoying warning .. I checked the code several times by now
to make sure it is not real. Good idea to fix it.

Applied to -next for now. Linus did not (yet) accept my last set of
patches, so I am not sure if it was too much cleanup for a release
candidate.

Guenter

Re: [PATCH] applesmc: Silence uninitialized warnings

[Henrik Rydberg]

> That was an annoying warning .. I checked the code several times by now
> to make sure it is not real. Good idea to fix it.
> 
> Applied to -next for now. Linus did not (yet) accept my last set of
> patches, so I am not sure if it was too much cleanup for a release
> candidate.

No problem, -next is just fine.

Thank you,
Henrik