From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 29 Jun 2021 13:51:25 +0000 (+0200)
Subject: Merge branches 'acpi-ec', 'acpi-apei', 'acpi-soc' and 'acpi-misc'
X-Git-Tag: v5.15~867^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64f9111dd6225a50b8fdd365dfdda275c2a708c0;p=platform%2Fkernel%2Flinux-starfive.git

Merge branches 'acpi-ec', 'acpi-apei', 'acpi-soc' and 'acpi-misc'

* acpi-ec:
  ACPI: EC: trust DSDT GPE for certain HP laptop
  ACPI: EC: Make more Asus laptops use ECDT _GPE

* acpi-apei:
  ACPI: APEI: fix synchronous external aborts in user-mode
  ACPI: APEI: Don't warn if ACPI is disabled

* acpi-soc:
  ACPI: LPSS: Use kstrtol() instead of simple_strtol()

* acpi-misc:
  ACPI: NVS: fix doc warnings in nvs.c
  ACPI: NUMA: fix typo in a comment
  ACPI: OSL: Use DEFINE_RES_IO_NAMED() to simplify code
  ACPI: bus: Call kobject_put() in acpi_init() error path
  ACPI: bus: Remove unneeded assignment
  ACPI: configfs: Replace ACPI_INFO() with pr_debug()
  ACPI: ipmi: Remove address space handler in error path
  ACPI: event: Remove redundant initialization of local variable
  ACPI: sbshc: Fix fall-through warning for Clang
---

64f9111dd6225a50b8fdd365dfdda275c2a708c0
diff --cc drivers/acpi/bus.c
index 14ec87a,be7da23,be7da23,be7da23,c69470e..60fb6a8
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@@@@@ -1315,14 -1325,13 -1325,13 -1325,13 -1325,12 +1315,13 @@@@@@ static int __init acpi_init(void
     	}
     
     	acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);
---- 	if (!acpi_kobj) {
++++ 	if (!acpi_kobj)
     		pr_debug("%s: kset create error\n", __func__);
---- 		acpi_kobj = NULL;
---- 	}
     
 ++++	init_prmt();
     	result = acpi_bus_init();
     	if (result) {
++++ 		kobject_put(acpi_kobj);
     		disable_acpi();
     		return result;
     	}