diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-10 00:15:44 -0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-01-16 15:55:43 -0500 |
| commit | c14973f93027500301fc40333e16ae49e58923a7 (patch) | |
| tree | 3871ff0541b63a80940516fd6cab2008de0420c9 | |
| parent | 7a0b73a49ab56fb1e836675c00d6d0d2ba39a714 (diff) | |
| download | kernel_samsung_aries-c14973f93027500301fc40333e16ae49e58923a7.zip kernel_samsung_aries-c14973f93027500301fc40333e16ae49e58923a7.tar.gz kernel_samsung_aries-c14973f93027500301fc40333e16ae49e58923a7.tar.bz2 | |
sony-laptop - fix using of uninitialized variable
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>
Acked-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | 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]) |