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

(-)2.6-acpi/drivers/acpi/battery.c (-3 / +7 lines)
Lines 486-499 Link Here
486
	else
486
	else
487
		p += sprintf(p, "capacity state:          critical\n");
487
		p += sprintf(p, "capacity state:          critical\n");
488
488
489
	if ((bst->state & 0x01) && (bst->state & 0x02))
489
	if ((bst->state & 0x01) && (bst->state & 0x02)){
490
		p += sprintf(p, "charging state:          charging/discharging\n");
490
		p += sprintf(p, "charging state:          charging/discharging\n");
491
		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
492
					"Charging bit and the Discharging bit must not set at the same time.\n"));
493
	}
491
	else if (bst->state & 0x01)
494
	else if (bst->state & 0x01)
492
		p += sprintf(p, "charging state:          discharging\n");
495
		p += sprintf(p, "charging state:          discharging\n");
493
	else if (bst->state & 0x02)
496
	else if (bst->state & 0x02)
494
		p += sprintf(p, "charging state:          charging\n");
497
		p += sprintf(p, "charging state:          charging\n");
495
	else
498
	else {
496
		p += sprintf(p, "charging state:          unknown\n");
499
		p += sprintf(p, "charging state:          No charging/discharging\n");
500
	}
497
501
498
	if (bst->present_rate == ACPI_BATTERY_VALUE_UNKNOWN)
502
	if (bst->present_rate == ACPI_BATTERY_VALUE_UNKNOWN)
499
		p += sprintf(p, "present rate:            unknown\n");
503
		p += sprintf(p, "present rate:            unknown\n");

Return to bug 1863