* 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
Unified · Split
| @@ -549,7 +549,7 @@ static ssize_t acpi_battery_alarm_store(struct device *dev, · 548 unmodified lines | ||
| 549 | 549 | { |
| 550 | 550 | unsigned long x; |
| 551 | 551 | struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev)); |
| 552 | − if (sscanf(buf, "%ld\n", &x) == 1) | |
| 552 | + if (sscanf(buf, "%lu\n", &x) == 1) | |
| 553 | 553 | battery->alarm = x/1000; |
| 554 | 554 | if (acpi_battery_present(battery)) |
| 555 | 555 | acpi_battery_set_alarm(battery); |
| @@ -60,7 +60,7 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset) · 59 unmodified lines | ||
| 60 | 60 | seq_printf(seq, "%c%-8s %s:%s\n", |
| 61 | 61 | dev->wakeup.flags.run_wake ? '*' : ' ', |
| 62 | 62 | (device_may_wakeup(&dev->dev) || |
| 63 | − (ldev && device_may_wakeup(ldev))) ? | |
| 63 | + device_may_wakeup(ldev)) ? | |
| 64 | 64 | "enabled" : "disabled", |
| 65 | 65 | ldev->bus ? ldev->bus->name : |
| 66 | 66 | "no-bus", dev_name(ldev)); |
| @@ -99,10 +99,6 @@ acpi_extract_package(union acpi_object *package, · 98 unmodified lines | ||
| 99 | 99 | |
| 100 | 100 | union acpi_object *element = &(package->package.elements[i]); |
| 101 | 101 | |
| 102 | − if (!element) { | |
| 103 | − return AE_BAD_DATA; | |
| 104 | − } | |
| 105 | − | |
| 106 | 102 | switch (element->type) { |
| 107 | 103 | |
| 108 | 104 | case ACPI_TYPE_INTEGER: |
| @@ -170,6 +170,14 @@ static struct dmi_system_id video_detect_dmi_table[] = { · 169 unmodified lines | ||
| 170 | 170 | }, |
| 171 | 171 | { |
| 172 | 172 | .callback = video_detect_force_vendor, |
| 173 | + .ident = "HP EliteBook Revolve 810", | |
| 174 | + .matches = { | |
| 175 | + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | |
| 176 | + DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook Revolve 810 G1"), | |
| 177 | + }, | |
| 178 | + }, | |
| 179 | + { | |
| 180 | + .callback = video_detect_force_vendor, | |
| 173 | 181 | .ident = "Lenovo Yoga 13", |
| 174 | 182 | .matches = { |
| 175 | 183 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), |