summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tpm/tpm_crb.c4
-rw-r--r--drivers/char/tpm/tpm_tis.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 916332c..9eb0404 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -227,8 +227,10 @@ static int crb_check_resource(struct acpi_resource *ares, void *data)
struct crb_priv *priv = data;
struct resource res;
- if (acpi_dev_resource_memory(ares, &res))
+ if (acpi_dev_resource_memory(ares, &res)) {
priv->res = res;
+ priv->res.name = NULL;
+ }
return 1;
}
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index ca137b5..2b2eff9 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -930,8 +930,10 @@ static int tpm_check_resource(struct acpi_resource *ares, void *data)
if (acpi_dev_resource_interrupt(ares, 0, &res))
tpm_info->irq = res.start;
- else if (acpi_dev_resource_memory(ares, &res))
+ else if (acpi_dev_resource_memory(ares, &res)) {
tpm_info->res = res;
+ tpm_info->res.name = NULL;
+ }
return 1;
}