Merge branches 'acpi-pci', 'acpi-misc' and 'acpi-tools'
* acpi-pci: ACPI,PCI,IRQ: remove SCI penalize function ACPI,PCI,IRQ: remove redundant code in acpi_irq_penalty_init() ACPI,PCI,IRQ: reduce static IRQ array size to 16 ACPI,PCI,IRQ: reduce resource requirements * acpi-misc: ACPI / sysfs: fix error code in get_status() ACPI / device_sysfs: Clean up checkpatch errors ACPI / device_sysfs: Change _SUN and _STA show functions error return to EIO ACPI / device_sysfs: Add sysfs support for _HRV hardware revision arm64: defconfig: Enable ACPI ACPI / ARM64: Remove EXPERT dependency for ACPI on ARM64 ACPI / ARM64: Don't enable ACPI by default on ARM64 acer-wmi: Use acpi_dev_found() eeepc-wmi: Use acpi_dev_found() ACPI / utils: Rename acpi_dev_present() * acpi-tools: tools/power/acpi: close file only if it is open
Šī revīzija ir iekļauta:
@@ -375,7 +375,7 @@ void usage(FILE *file, char *progname)
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int fd = 0;
|
||||
int fd = -1;
|
||||
int ch;
|
||||
int len;
|
||||
int ret = EXIT_SUCCESS;
|
||||
@@ -430,7 +430,7 @@ int main(int argc, char **argv)
|
||||
acpi_aml_loop(fd);
|
||||
|
||||
exit:
|
||||
if (fd < 0)
|
||||
if (fd >= 0)
|
||||
close(fd);
|
||||
if (acpi_aml_batch_cmd)
|
||||
free(acpi_aml_batch_cmd);
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user