Commit 20eeeafb authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents acd448f3 b226faab 7d1eb2d8 9a2e849f 05de0686

drivers/acpi/acpi_configfs.c

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ static void acpi_table_drop_item(struct config_group *group, 


	ACPI_INFO(("Host-directed Dynamic ACPI Table Unload"));

	acpi_unload_table(table->index);

	config_item_put(cfg);

}



static struct configfs_group_operations acpi_table_group_ops = {

drivers/acpi/scan.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	if (err)

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				"error in _DSW or _PSW evaluation\n"));

		pr_debug("error in _DSW or _PSW evaluation\n");

}



static void acpi_bus_init_power_state(struct acpi_device *device, int state)

drivers/acpi/video_detect.c

+9 −0
Original line number Diff line number Diff line
@@ -282,6 +282,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		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 */

	{

include/acpi/battery.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef __ACPI_BATTERY_H

#define __ACPI_BATTERY_H



#include <linux/power_supply.h>



#define ACPI_BATTERY_CLASS "battery"



#define ACPI_BATTERY_NOTIFY_STATUS	0x80

CRA Git | Maintained and supported by SUSTech CRA and CCSE