View | Details | Raw Unified | Return to bug 114960
Collapse All | Expand All

(-)drivers/acpi/asus_acpi.c_org (-4 / +19 lines)
Lines 602-610 Link Here
602
602
603
		if (read_acpi_int(NULL, ledname, &led_status))
603
		if (read_acpi_int(NULL, ledname, &led_status))
604
			return led_status;
604
			return led_status;
605
#ifdef DEBUG
605
		else
606
		else
606
			printk(KERN_WARNING "Asus ACPI: Error reading LED "
607
			printk(KERN_WARNING "Asus ACPI: Error reading LED "
607
			       "status\n");
608
			       "status\n");
609
#endif
608
	}
610
	}
609
	return (hotk->status & ledmask) ? 1 : 0;
611
	return (hotk->status & ledmask) ? 1 : 0;
610
}
612
}
Lines 756-763 Link Here
756
758
757
	if (hotk->model != L3H) {
759
	if (hotk->model != L3H) {
758
	/* We don't have to check anything if we are here */
760
	/* We don't have to check anything if we are here */
759
		if (!read_acpi_int(NULL, hotk->methods->lcd_status, &lcd))
761
		if (!read_acpi_int(NULL, hotk->methods->lcd_status, &lcd)) {
762
#ifdef DEBUG
760
			printk(KERN_WARNING "Asus ACPI: Error reading LCD status\n");
763
			printk(KERN_WARNING "Asus ACPI: Error reading LCD status\n");
764
#endif
765
		}
761
	
766
	
762
		if (hotk->model == L2D)
767
		if (hotk->model == L2D)
763
			lcd = ~lcd;
768
			lcd = ~lcd;
Lines 843-854 Link Here
843
	
848
	
844
	if(hotk->methods->brightness_get) { /* SPLV/GPLV laptop */
849
	if(hotk->methods->brightness_get) { /* SPLV/GPLV laptop */
845
		if (!read_acpi_int(hotk->handle, hotk->methods->brightness_get, 
850
		if (!read_acpi_int(hotk->handle, hotk->methods->brightness_get, 
846
				   &value))
851
				   &value)) {
852
#ifdef DEBUG
847
			printk(KERN_WARNING "Asus ACPI: Error reading brightness\n");
853
			printk(KERN_WARNING "Asus ACPI: Error reading brightness\n");
854
#endif
855
		}
848
	} else if (hotk->methods->brightness_status) { /* For D1 for example */
856
	} else if (hotk->methods->brightness_status) { /* For D1 for example */
849
		if (!read_acpi_int(NULL, hotk->methods->brightness_status, 
857
		if (!read_acpi_int(NULL, hotk->methods->brightness_status, 
850
				   &value))
858
				   &value)) {
859
#ifdef DEBUG
851
			printk(KERN_WARNING "Asus ACPI: Error reading brightness\n");
860
			printk(KERN_WARNING "Asus ACPI: Error reading brightness\n");
861
#endif
862
		}
852
	} else /* No GPLV method */
863
	} else /* No GPLV method */
853
		value = hotk->brightness;
864
		value = hotk->brightness;
854
	return value;
865
	return value;
Lines 927-934 Link Here
927
{
938
{
928
	int value = 0;
939
	int value = 0;
929
	
940
	
930
	if (!read_acpi_int(hotk->handle, hotk->methods->display_get, &value))
941
	if (!read_acpi_int(hotk->handle, hotk->methods->display_get, &value)) {
942
#ifdef DEBUG
931
		printk(KERN_WARNING "Asus ACPI: Error reading display status\n");
943
		printk(KERN_WARNING "Asus ACPI: Error reading display status\n");
944
#endif
945
	}
946
932
	value &= 0x07; /* needed for some models, shouldn't hurt others */
947
	value &= 0x07; /* needed for some models, shouldn't hurt others */
933
	return sprintf(page, "%d\n", value);
948
	return sprintf(page, "%d\n", value);
934
}
949
}

Return to bug 114960