Commit 6311f0da authored by Darren Jenkins's avatar Darren Jenkins Committed by Len Brown
Browse files

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: default avatarDarren Jenkins <darrenrjenkins@gmail.com>
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 288f3ad4

drivers/acpi/asus_acpi.c

+23 −23
Original line number Diff line number Diff line
@@ -567,11 +567,11 @@ static int 
write_led(const char __user * buffer, unsigned long count,

	  char *ledname, int ledmask, int invert)

{

	int value;

	int rv, value;

	int led_out = 0;



	count = parse_arg(buffer, count, &value);

	if (count > 0)

	rv = parse_arg(buffer, count, &value);

	if (rv > 0)

		led_out = value ? 1 : 0;



	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",

		       ledname);



	return count;

	return rv;

}



/*
@@ -619,20 +619,20 @@ static int 
proc_write_ledd(struct file *file, const char __user * buffer,

		unsigned long count, void *data)

{

	int value;

	int rv, value;



	count = parse_arg(buffer, count, &value);

	if (count > 0) {

	rv = parse_arg(buffer, count, &value);

	if (rv > 0) {

		if (!write_acpi_int

		    (hotk->handle, hotk->methods->mt_ledd, value, NULL))

			printk(KERN_WARNING

			       "Asus ACPI: LED display write failed\n");

		else

			hotk->ledd_status = (u32) value;

	} else if (count < 0)

	} else if (rv < 0)

		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,

	       unsigned long count, void *data)

{

	int value;

	int rv, value;



	count = parse_arg(buffer, count, &value);

	if (count > 0)

	rv = parse_arg(buffer, count, &value);

	if (rv > 0)

		set_lcd_state(value);

	return count;

	return rv;

}



static int read_brightness(void)
@@ -842,18 +842,18 @@ static int 
proc_write_brn(struct file *file, const char __user * buffer,

	       unsigned long count, void *data)

{

	int value;

	int rv, value;



	count = parse_arg(buffer, count, &value);

	if (count > 0) {

	rv = parse_arg(buffer, count, &value);

	if (rv > 0) {

		value = (0 < value) ? ((15 < value) ? 15 : value) : 0;

		/* 0 <= value <= 15 */

		set_brightness(value);

	} else if (count < 0) {

	} else if (rv < 0) {

		printk(KERN_WARNING "Asus ACPI: Error reading user input\n");

	}



	return count;

	return rv;

}



static void set_display(int value)
@@ -892,15 +892,15 @@ static int 
proc_write_disp(struct file *file, const char __user * buffer,

		unsigned long count, void *data)

{

	int value;

	int rv, value;



	count = parse_arg(buffer, count, &value);

	if (count > 0)

	rv = parse_arg(buffer, count, &value);

	if (rv > 0)

		set_display(value);

	else if (count < 0)

	else if (rv < 0)

		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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE