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

Merge branches 'acpi-cleanup' and 'acpi-video' 

* acpi-cleanup:
  ACPI / battery: Fix incorrect sscanf() string in acpi_battery_init_alarm()
  ACPI / proc: remove unneeded NULL check
  ACPI / utils: remove a pointless NULL check

* acpi-video:
  ACPI / video: Add HP EliteBook Revolve 810 to the blacklist
parents 7fd90506 47a08c85 e18ac62f

drivers/acpi/battery.c

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ static ssize_t acpi_battery_alarm_store(struct device *dev, 
{

	unsigned long x;

	struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));

	if (sscanf(buf, "%ld\n", &x) == 1)

	if (sscanf(buf, "%lu\n", &x) == 1)

		battery->alarm = x/1000;

	if (acpi_battery_present(battery))

		acpi_battery_set_alarm(battery);

drivers/acpi/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset) 
				seq_printf(seq, "%c%-8s  %s:%s\n",

					dev->wakeup.flags.run_wake ? '*' : ' ',

					(device_may_wakeup(&dev->dev) ||

					(ldev && device_may_wakeup(ldev))) ?

					device_may_wakeup(ldev)) ?

					"enabled" : "disabled",

					ldev->bus ? ldev->bus->name :

					"no-bus", dev_name(ldev));

drivers/acpi/utils.c

+0 −4
Original line number Diff line number Diff line
@@ -99,10 +99,6 @@ acpi_extract_package(union acpi_object *package, 


		union acpi_object *element = &(package->package.elements[i]);



		if (!element) {

			return AE_BAD_DATA;

		}



		switch (element->type) {



		case ACPI_TYPE_INTEGER:

drivers/acpi/video_detect.c

+8 −0
Original line number Diff line number Diff line
@@ -170,6 +170,14 @@ static struct dmi_system_id video_detect_dmi_table[] = { 
	},

	{

	.callback = video_detect_force_vendor,

	.ident = "HP EliteBook Revolve 810",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook Revolve 810 G1"),

		},

	},

	{

	.callback = video_detect_force_vendor,

	.ident = "Lenovo Yoga 13",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),