Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / char / tpm / tpm_crb.c

diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 717b6b47c042760fe4db4f6834e8d40af5d2a117..86f355b6df1d345ff9cf0874c40a29f5f986b0f2 100644 (file)
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -264,10 +264,12 @@ static const struct tpm_class_ops tpm_crb = {
 static int crb_check_resource(struct acpi_resource *ares, void *data)
 {
        struct resource *io_res = data;
-       struct resource res;
+       struct resource_win win;
+       struct resource *res = &(win.res);
 
-       if (acpi_dev_resource_memory(ares, &res)) {
-               *io_res = res;
+       if (acpi_dev_resource_memory(ares, res) ||
+           acpi_dev_resource_address_space(ares, &win)) {
+               *io_res = *res;
                io_res->name = NULL;
        }