summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2016-02-17 03:10:52 +0300
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2016-02-20 10:59:33 +0300
commit30f9c8c9e2ea37473a51354e9e492580a40661ce (patch)
tree9bbe501babb3545be8f504a874c56169607954c7 /drivers/char
parent186d124f07da193a8f47e491af85cb695d415f2f (diff)
downloadlinux-30f9c8c9e2ea37473a51354e9e492580a40661ce.tar.xz
tpm_crb/tis: fix: use dev_name() for /proc/iomem
In all cases use dev_name() for the mapped resources. This is both for sake of consistency and also with some platforms resource name given by ACPI object seems to return garbage. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Fixes: 1bd047be37d9 ("tpm_crb: Use devm_ioremap_resource")
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 916332c9d906..9eb04044c385 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 ca137b5b7c24..2b2eff9e769e 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;
}