Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6415e12b authored by Zhao Yakui's avatar Zhao Yakui Committed by Len Brown
Browse files

ACPI: Add DMI check to disable power state check in power transition 

Add the DMI check to disable power check in the course of device power
transistion.

http://bugzilla.kernel.org/show_bug.cgi?id=11000



Signed-off-by: default avatarZhao Yakui <yakui.zhao@intel.com>
Signed-off-by: default avatarLi Shaohua <shaohua.li@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent f5adfaa3

drivers/acpi/bus.c

+22 −1
Original line number Diff line number Diff line
@@ -48,6 +48,23 @@ EXPORT_SYMBOL(acpi_root_dir); 


#define STRUCT_TO_INT(s)	(*((int*)&s))



static int set_power_nocheck(const struct dmi_system_id *id)

{

	printk(KERN_NOTICE PREFIX "%s detected - "

		"disable power check in power transistion\n", id->ident);

	acpi_power_nocheck = 1;

	return 0;

}

static struct dmi_system_id __cpuinitdata power_nocheck_dmi_table[] = {

	{

	set_power_nocheck, "HP Pavilion 05", {

	DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),

	DMI_MATCH(DMI_SYS_VENDOR, "HP Pavilion 05"),

	DMI_MATCH(DMI_PRODUCT_VERSION, "2001211RE101GLEND") }, NULL},

	{},

};





/* --------------------------------------------------------------------------

                                Device Management

   -------------------------------------------------------------------------- */
@@ -830,7 +847,11 @@ static int __init acpi_init(void) 
		}

	} else

		disable_acpi();



	/*

	 * If the laptop falls into the DMI check table, the power state check

	 * will be disabled in the course of device power transistion.

	 */

	dmi_check_system(power_nocheck_dmi_table);

	return result;

}