mirror of
https://github.com/torvalds/linux.git
synced 2024-09-21 07:23:06 +00:00
Merge branches 'acpi-video', 'acpi-battery', 'acpi-config' and 'acpi-scan'
* acpi-video: ACPI: video: use ACPI backlight for HP 635 Notebook * acpi-battery: ACPI: battery: include linux/power_supply.h * acpi-config: ACPI: configfs: Add missing config_item_put() to fix refcount leak * acpi-scan: ACPI: scan: Replace ACPI_DEBUG_PRINT() with pr_debug()
This commit is contained in:
commit
20eeeafb91
|
@ -228,6 +228,7 @@ static void acpi_table_drop_item(struct config_group *group,
|
||||||
|
|
||||||
ACPI_INFO(("Host-directed Dynamic ACPI Table Unload"));
|
ACPI_INFO(("Host-directed Dynamic ACPI Table Unload"));
|
||||||
acpi_unload_table(table->index);
|
acpi_unload_table(table->index);
|
||||||
|
config_item_put(cfg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct configfs_group_operations acpi_table_group_ops = {
|
static struct configfs_group_operations acpi_table_group_ops = {
|
||||||
|
|
|
@ -898,8 +898,7 @@ static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
|
||||||
*/
|
*/
|
||||||
err = acpi_device_sleep_wake(device, 0, 0, 0);
|
err = acpi_device_sleep_wake(device, 0, 0, 0);
|
||||||
if (err)
|
if (err)
|
||||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
pr_debug("error in _DSW or _PSW evaluation\n");
|
||||||
"error in _DSW or _PSW evaluation\n"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void acpi_bus_init_power_state(struct acpi_device *device, int state)
|
static void acpi_bus_init_power_state(struct acpi_device *device, int state)
|
||||||
|
|
|
@ -282,6 +282,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
|
||||||
DMI_MATCH(DMI_PRODUCT_NAME, "530U4E/540U4E"),
|
DMI_MATCH(DMI_PRODUCT_NAME, "530U4E/540U4E"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
/* https://bugs.launchpad.net/bugs/1894667 */
|
||||||
|
{
|
||||||
|
.callback = video_detect_force_video,
|
||||||
|
.ident = "HP 635 Notebook",
|
||||||
|
.matches = {
|
||||||
|
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
|
||||||
|
DMI_MATCH(DMI_PRODUCT_NAME, "HP 635 Notebook PC"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
/* Non win8 machines which need native backlight nevertheless */
|
/* Non win8 machines which need native backlight nevertheless */
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
#ifndef __ACPI_BATTERY_H
|
#ifndef __ACPI_BATTERY_H
|
||||||
#define __ACPI_BATTERY_H
|
#define __ACPI_BATTERY_H
|
||||||
|
|
||||||
|
#include <linux/power_supply.h>
|
||||||
|
|
||||||
#define ACPI_BATTERY_CLASS "battery"
|
#define ACPI_BATTERY_CLASS "battery"
|
||||||
|
|
||||||
#define ACPI_BATTERY_NOTIFY_STATUS 0x80
|
#define ACPI_BATTERY_NOTIFY_STATUS 0x80
|
||||||
|
|
Loading…
Reference in New Issue
Block a user