From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:60272 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753873AbcHRK60 (ORCPT ); Thu, 18 Aug 2016 06:58:26 -0400 Subject: Patch "tpm_crb: fix address space of the return pointer in crb_map_res()" has been added to the 4.7-stable tree To: jarkko.sakkinen@linux.intel.com, gregkh@linuxfoundation.org, stefanb@linux.vnet.ibm.com Cc: , From: Date: Thu, 18 Aug 2016 12:57:40 +0200 Message-ID: <147151786011238@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled tpm_crb: fix address space of the return pointer in crb_map_res() to the 4.7-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: tpm_crb-fix-address-space-of-the-return-pointer-in-crb_map_res.patch and it can be found in the queue-4.7 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From f786b752098216fedb73ba2905c8cce12358534a Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Fri, 17 Jun 2016 16:39:29 +0200 Subject: tpm_crb: fix address space of the return pointer in crb_map_res() From: Jarkko Sakkinen 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] * drivers/char/tpm//tpm_crb.c:248:31: got void * Fixes: 1bd047be37d9 ("tpm_crb: Use devm_ioremap_resource") Signed-off-by: Jarkko Sakkinen Tested-by: Stefan Berger Signed-off-by: Greg Kroah-Hartman --- drivers/char/tpm/tpm_crb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -246,7 +246,7 @@ static void __iomem *crb_map_res(struct /* 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); Patches currently in stable-queue which might be from jarkko.sakkinen@linux.intel.com are queue-4.7/tpm_crb-fix-address-space-of-the-return-pointer-in-crb_map_res.patch