diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2022-01-15 15:54:40 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2022-01-15 15:54:40 +0000 |
| commit | 96c0318c4aa4b42e764affb0c1bcb5e9978795d6 (patch) | |
| tree | 44f6dd62fae7d5b953b50243a03472d56f4a3527 /sys/dev | |
| parent | cffb9b4323eb438d7c0ba1ec7341a8c9d6d7744b (diff) | |
acpi: sdhc: Read caps2 even if sdhci-caps{,-mask} doesn't touch the bits
SDHC_FLAG_HOSTCAPS means that the driver has to supply both caps and caps2
values.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/sdhc_acpi.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/acpi/sdhc_acpi.c b/sys/dev/acpi/sdhc_acpi.c index f74d98e91f5..da4ffe870b4 100644 --- a/sys/dev/acpi/sdhc_acpi.c +++ b/sys/dev/acpi/sdhc_acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdhc_acpi.c,v 1.17 2022/01/15 14:49:43 jmcneill Exp $ */ +/* $NetBSD: sdhc_acpi.c,v 1.18 2022/01/15 15:54:40 jmcneill Exp $ */ /* * Copyright (c) 2016 Kimihiro Nonaka <nonaka@NetBSD.org> @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sdhc_acpi.c,v 1.17 2022/01/15 14:49:43 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdhc_acpi.c,v 1.18 2022/01/15 15:54:40 jmcneill Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -252,12 +252,10 @@ sdhc_acpi_attach(device_t parent, device_t self, void *opaque) SDHC_CAPABILITIES); sc->sc.sc_caps &= ~(caps_mask & 0xffffffff); sc->sc.sc_caps |= (caps & 0xffffffff); - if (((caps | caps_mask) >> 32) != 0) { - sc->sc.sc_caps2 = bus_space_read_4(sc->sc_memt, - sc->sc_memh, SDHC_CAPABILITIES2); - sc->sc.sc_caps2 &= ~(caps_mask >> 32); - sc->sc.sc_caps2 |= (caps >> 32); - } + sc->sc.sc_caps2 = bus_space_read_4(sc->sc_memt, + sc->sc_memh, SDHC_CAPABILITIES2); + sc->sc.sc_caps2 &= ~(caps_mask >> 32); + sc->sc.sc_caps2 |= (caps >> 32); sc->sc.sc_flags |= SDHC_FLAG_HOSTCAPS; } |
