From: marco <marco@openbsd.org>
Date: Tue, 27 Jul 2010 21:55:54 +0000 (+0000)
Subject: Revert 1.34 certain systems need the parent ec pointer initialized earlier.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=82faf4d25946503df46c7687ea4f5eaf3d0111ee;p=openbsd

Revert 1.34 certain systems need the parent ec pointer initialized earlier.
This fixes acpi interrupts on the latitude e6500.

Tested on e6500 and x61.

debugged with, and ok jordan
---

diff --git a/sys/dev/acpi/acpiec.c b/sys/dev/acpi/acpiec.c
index ae692ea3817..0c59be82a7c 100644
--- a/sys/dev/acpi/acpiec.c
+++ b/sys/dev/acpi/acpiec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiec.c,v 1.36 2010/07/27 06:12:50 deraadt Exp $ */
+/* $OpenBSD: acpiec.c,v 1.37 2010/07/27 21:55:54 marco Exp $ */
 /*
  * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>
  *
@@ -268,6 +268,7 @@ acpiec_attach(struct device *parent, struct device *self, void *aux)
 		printf(": Only single EC is supported\n");
 		return;
 	}
+	sc->sc_acpi->sc_ec = sc;
 
 	if (acpiec_getcrs(sc, aa)) {
 		printf(": Failed to read resource settings\n");
@@ -279,7 +280,6 @@ acpiec_attach(struct device *parent, struct device *self, void *aux)
 		return;
 	}
 
-	sc->sc_acpi->sc_ec = sc;
 	acpiec_get_events(sc);
 
 	dnprintf(10, "%s: GPE: %d\n", DEVNAME(sc), sc->sc_gpe);