diff options
| author |   deraadt <deraadt@openbsd.org> | 2010-07-27 06:12:50 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2010-07-27 06:12:50 +0000 |
| commit | 6b3622eb1e4d2ac783f5c1e4f76cefdd969152bd (patch) | |
| tree | 7a4b8f6935e22447f20c0cd43b53e506b539e824 | |
| parent | Early initialization of acpiec if ECDT table exists (diff) | |
| download | wireguard-openbsd-6b3622eb1e4d2ac783f5c1e4f76cefdd969152bd.tar.xz wireguard-openbsd-6b3622eb1e4d2ac783f5c1e4f76cefdd969152bd.zip | |
annoying spaces getting in the way
| -rw-r--r-- | sys/dev/acpi/acpiec.c | 4 | ||||
| -rw-r--r-- | sys/dev/acpi/acpisony.c | 6 | ||||
| -rw-r--r-- | sys/dev/acpi/acpivideo.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/acpi/acpiec.c b/sys/dev/acpi/acpiec.c index 34679479d2d..ae692ea3817 100644 --- a/sys/dev/acpi/acpiec.c +++ b/sys/dev/acpi/acpiec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpiec.c,v 1.35 2010/07/27 05:17:36 jordan Exp $ */ +/* $OpenBSD: acpiec.c,v 1.36 2010/07/27 06:12:50 deraadt Exp $ */ /* * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org> * @@ -245,7 +245,7 @@ acpiec_match(struct device *parent, void *match, void *aux) { struct acpi_attach_args *aa = aux; struct cfdata *cf = match; - struct acpi_ecdt *ecdt = aa->aaa_table; + struct acpi_ecdt *ecdt = aa->aaa_table; /* Check for early ECDT table attach */ if (ecdt && !memcmp(ecdt->hdr.signature, ECDT_SIG, sizeof(ECDT_SIG) - 1)) diff --git a/sys/dev/acpi/acpisony.c b/sys/dev/acpi/acpisony.c index a1757b18b10..627853f44e8 100644 --- a/sys/dev/acpi/acpisony.c +++ b/sys/dev/acpi/acpisony.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpisony.c,v 1.1 2010/07/26 11:29:23 pirofti Exp $ */ +/* $OpenBSD: acpisony.c,v 1.2 2010/07/27 06:12:50 deraadt Exp $ */ /* * Copyright (c) 2010 Paul Irofti <pirofti@openbsd.org> * @@ -254,7 +254,7 @@ acpisony_find_offset(struct acpisony_softc *sc, int key) arg.type = AML_OBJTYPE_INTEGER; for (arg.v_integer = 0x20; arg.v_integer < 0x30; arg.v_integer++) { - aml_evalname(sc->sc_acpi, sc->sc_devnode, "SN00", 1, &arg, &res); + aml_evalname(sc->sc_acpi, sc->sc_devnode, "SN00", 1, &arg, &res); val = aml_val2int(&res); aml_freevalue(&res); if (val == key) { @@ -274,7 +274,7 @@ acpisony_set_hotkey(struct acpisony_softc *sc, int key, int val) bzero(&arg, sizeof(arg)); arg.type = AML_OBJTYPE_INTEGER; - + off = acpisony_find_offset(sc, key); DPRINTF(("off = %X\n", off)); if (off < 0) diff --git a/sys/dev/acpi/acpivideo.c b/sys/dev/acpi/acpivideo.c index b101a2eb272..149139f7bee 100644 --- a/sys/dev/acpi/acpivideo.c +++ b/sys/dev/acpi/acpivideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivideo.c,v 1.6 2010/07/26 17:46:29 kettenis Exp $ */ +/* $OpenBSD: acpivideo.c,v 1.7 2010/07/27 06:12:50 deraadt Exp $ */ /* * Copyright (c) 2008 Federico G. Schwindt <fgsch@openbsd.org> * Copyright (c) 2009 Paul Irofti <pirofti@openbsd.org> @@ -177,7 +177,7 @@ acpi_foundvout(struct aml_node *node, void *arg) av.aaa.aaa_node = node->parent; av.aaa.aaa_name = "acpivout"; av.dod = sc->sc_dod[i]; - /* + /* * Make sure we don't attach twice if both _BCL and * _DCS methods are found by zeroing the DOD address. */ @@ -220,7 +220,7 @@ acpivideo_get_dod(struct acpivideo_softc * sc) aml_freevalue(&res); return; } - sc->sc_dod = malloc(sc->sc_dod_len * sizeof(int), M_DEVBUF, + sc->sc_dod = malloc(sc->sc_dod_len * sizeof(int), M_DEVBUF, M_WAITOK|M_ZERO); if (sc->sc_dod == NULL) { aml_freevalue(&res); |