[PATCH] sony-laptop - fix using of uninitialized variable

[PATCH] sony-laptop - fix using of uninitialized variable

[Dmitry Torokhov]

CC [M]  drivers/platform/x86/sony-laptop.o
drivers/platform/x86/sony-laptop.c: In function 'sony_nc_rfkill_setup':
drivers/platform/x86/sony-laptop.c:1162: warning: 'i' may be used uninitialized in this function

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

This is a real warning and without the fix we may be setting up
non-existing rfkill devices so please consider for .33.

 drivers/platform/x86/sony-laptop.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 5af5334..3f71a60 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1201,9 +1201,12 @@ static void sony_nc_rfkill_setup(struct acpi_device *device)
 	/* the buffer is filled with magic numbers describing the devices
 	 * available, 0xff terminates the enumeration
 	 */
-	while ((dev_code = *(device_enum->buffer.pointer + i)) != 0xff &&
-			i < device_enum->buffer.length) {
-		i++;
+	for (i = 0; i < device_enum->buffer.length; i++) {
+
+		dev_code = *(device_enum->buffer.pointer + i);
+		if (dev_code == 0xff)
+			break;
+
 		dprintk("Radio devices, looking at 0x%.2x\n", dev_code);
 
 		if (dev_code == 0 && !sony_rfkill_devices[SONY_WIFI])
-- 
Dmitry

Re: [PATCH] sony-laptop - fix using of uninitialized variable

[Mattia Dongili]

On Sun, Jan 10, 2010 at 12:15:44AM -0800, Dmitry Torokhov wrote:
> CC [M]  drivers/platform/x86/sony-laptop.o
> drivers/platform/x86/sony-laptop.c: In function 'sony_nc_rfkill_setup':
> drivers/platform/x86/sony-laptop.c:1162: warning: 'i' may be used uninitialized in this function
> 
> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> ---
> 
> This is a real warning and without the fix we may be setting up
> non-existing rfkill devices so please consider for .33.

Thanks Dmitry.

Len, please submit this for 2.6.33 and add my
Acked-by: Mattia Dongili <malattia@linux.it>
-- 
mattia
:wq!

Re: [PATCH] sony-laptop - fix using of uninitialized variable

[Len Brown]

applied

thanks,
Len Brown, Intel Open Source Technology Center