]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tpm_crb: fix address space of the return pointer in crb_map_res()
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Fri, 17 Jun 2016 14:39:29 +0000 (16:39 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Aug 2016 16:10:58 +0000 (18:10 +0200)
commit f786b752098216fedb73ba2905c8cce12358534a upstream.

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 *

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/tpm/tpm_crb.c

index a12b3194034442ad4c5f87d9c6c6999d954edff5..e9fd1d83f9f1f483ba0e59ea94880f9a20159dfd 100644 (file)
@@ -246,7 +246,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(&priv->res, &new_res))
                return devm_ioremap_resource(dev, &new_res);