svn commit: r360224 - head/sys/dev/acpica

[Conrad Meyer]

Author: cem
Date: Thu Apr 23 17:30:03 2020
New Revision: 360224
URL: https://svnweb.freebsd.org/changeset/base/360224

Log:
  acpi_ec(4): Don't probe erroneously if success occurred
  
  In r360131, acpi_ec probe was changed to not clobber an error status prior to
  several error cases that did not explicitly set the error variable before
  goto'ing the exit path.  However, I did not notice that the error variable was
  not set to success in the success path.  That caused all successful probes to
  fail, which is obviously undesirable.
  
  PR:		245778
  Reported by:	Neel Chauhan <neel AT neelc.org>, Evilham <contact AT evilham.com>
  Tested by:	Evilham
  X-MFC-With:	r360131

Modified:
  head/sys/dev/acpica/acpi_ec.c

Modified: head/sys/dev/acpica/acpi_ec.c
==============================================================================
--- head/sys/dev/acpica/acpi_ec.c	Thu Apr 23 14:08:40 2020	(r360223)
+++ head/sys/dev/acpica/acpi_ec.c	Thu Apr 23 17:30:03 2020	(r360224)
@@ -443,6 +443,8 @@ acpi_ec_probe(device_t dev)
 
     if (buf.Pointer)
 	AcpiOsFree(buf.Pointer);
+
+    ret = rc;
 out:
     if (ret <= 0) {
 	snprintf(desc, sizeof(desc), "Embedded Controller: GPE %#x%s%s",