UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPI: asus_acpi: fix proc files parsing 

ICC complains about a "Pointless comparsion of unsigned interger with zero"
@ line 760 & 808 of asus_acpi.c

parse_arg() mentioned below returns -E but it's copied into unsigned variable...

Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Darren Jenkins 2006-10-10 14:20:35 -07:00 committed by Len Brown
parent 288f3ad406
commit 6311f0dac0
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/acpi/asus_acpi.c
View File

@ -567,11 +567,11 @@ static int
write_led(const char __user * buffer, unsigned long count, write_led(const char __user * buffer, unsigned long count,
char *ledname, int ledmask, int invert) char *ledname, int ledmask, int invert)
{ {
int value; int rv, value;
int led_out = 0; int led_out = 0;
count = parse_arg(buffer, count, &value); rv = parse_arg(buffer, count, &value);
if (count > 0) if (rv > 0)
led_out = value ? 1 : 0; led_out = value ? 1 : 0;
hotk->status = hotk->status =
@ -584,7 +584,7 @@ write_led(const char __user * buffer, unsigned long count,
printk(KERN_WARNING "Asus ACPI: LED (%s) write failed\n", printk(KERN_WARNING "Asus ACPI: LED (%s) write failed\n",
ledname); ledname);
return count; return rv;
} }
/* /*
@ -619,20 +619,20 @@ static int
proc_write_ledd(struct file *file, const char __user * buffer, proc_write_ledd(struct file *file, const char __user * buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
int value; int rv, value;
count = parse_arg(buffer, count, &value); rv = parse_arg(buffer, count, &value);
if (count > 0) { if (rv > 0) {
if (!write_acpi_int if (!write_acpi_int
(hotk->handle, hotk->methods->mt_ledd, value, NULL)) (hotk->handle, hotk->methods->mt_ledd, value, NULL))
printk(KERN_WARNING printk(KERN_WARNING
"Asus ACPI: LED display write failed\n"); "Asus ACPI: LED display write failed\n");
else else
hotk->ledd_status = (u32) value; hotk->ledd_status = (u32) value;
} else if (count < 0) } else if (rv < 0)
printk(KERN_WARNING "Asus ACPI: Error reading user input\n"); printk(KERN_WARNING "Asus ACPI: Error reading user input\n");
return count; return rv;
} }
/* /*
@ -773,12 +773,12 @@ static int
proc_write_lcd(struct file *file, const char __user * buffer, proc_write_lcd(struct file *file, const char __user * buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
int value; int rv, value;
count = parse_arg(buffer, count, &value); rv = parse_arg(buffer, count, &value);
if (count > 0) if (rv > 0)
set_lcd_state(value); set_lcd_state(value);
return count; return rv;
} }
static int read_brightness(void) static int read_brightness(void)
@ -842,18 +842,18 @@ static int
proc_write_brn(struct file *file, const char __user * buffer, proc_write_brn(struct file *file, const char __user * buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
int value; int rv, value;
count = parse_arg(buffer, count, &value); rv = parse_arg(buffer, count, &value);
if (count > 0) { if (rv > 0) {
value = (0 < value) ? ((15 < value) ? 15 : value) : 0; value = (0 < value) ? ((15 < value) ? 15 : value) : 0;
/* 0 <= value <= 15 */ /* 0 <= value <= 15 */
set_brightness(value); set_brightness(value);
} else if (count < 0) { } else if (rv < 0) {
printk(KERN_WARNING "Asus ACPI: Error reading user input\n"); printk(KERN_WARNING "Asus ACPI: Error reading user input\n");
} }
return count; return rv;
} }
static void set_display(int value) static void set_display(int value)
@ -892,15 +892,15 @@ static int
proc_write_disp(struct file *file, const char __user * buffer, proc_write_disp(struct file *file, const char __user * buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
int value; int rv, value;
count = parse_arg(buffer, count, &value); rv = parse_arg(buffer, count, &value);
if (count > 0) if (rv > 0)
set_display(value); set_display(value);
else if (count < 0) else if (rv < 0)
printk(KERN_WARNING "Asus ACPI: Error reading user input\n"); printk(KERN_WARNING "Asus ACPI: Error reading user input\n");
return count; return rv;
} }
typedef int (proc_readfunc) (char *page, char **start, off_t off, int count, typedef int (proc_readfunc) (char *page, char **start, off_t off, int count,