diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-06-17 16:39:29 +0200 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-06-25 16:28:57 +0200 |
| commit | f786b752098216fedb73ba2905c8cce12358534a (patch) | |
| tree | 49af1156ff3bd987edea7c5c5aa7403b43014121 | |
| parent | tpm_vtpm_proxy: fix address space of a user pointer in vtpmx_fops_ioctl() (diff) | |
| download | linux-f786b752098216fedb73ba2905c8cce12358534a.tar.xz linux-f786b752098216fedb73ba2905c8cce12358534a.zip | |
tpm_crb: fix address space of the return pointer in crb_map_res()
When running make C=2 M=drivers/char/tpm/
CHECK drivers/char/tpm//tpm_crb.c
drivers/char/tpm//tpm_crb.c:248:31: warning: incorrect type in return expression (different address spaces)
drivers/char/tpm//tpm_crb.c:248:31: expected void [noderef] <asn:2>*
drivers/char/tpm//tpm_crb.c:248:31: got void *
CC: stable@vger.kernel.org
Fixes: 1bd047be37d9 ("tpm_crb: Use devm_ioremap_resource")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
| -rw-r--r-- | drivers/char/tpm/tpm_crb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 1547636368e8..1b8e1b51bfc0 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -245,7 +245,7 @@ static void __iomem *crb_map_res(struct device *dev, struct crb_priv *priv, /* Detect a 64 bit address on a 32 bit system */ if (start != new_res.start) - return ERR_PTR(-EINVAL); + return (void __iomem *) ERR_PTR(-EINVAL); if (!resource_contains(io_res, &new_res)) return devm_ioremap_resource(dev, &new_res); |