[4.2.y-ckt stable] Patch "i2c: brcmstb: allocate correct amount of memory for regmap" has been added to the 4.2.y-ckt tree
Kamal Mostafa
kamal at canonical.com
Tue Mar 15 23:25:47 UTC 2016
This is a note to let you know that I have just added a patch titled
i2c: brcmstb: allocate correct amount of memory for regmap
to the linux-4.2.y-queue branch of the 4.2.y-ckt extended stable tree
which can be found at:
http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-4.2.y-queue
This patch is scheduled to be released in version 4.2.8-ckt6.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 4.2.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Kamal
---8<------------------------------------------------------------
>From ca98f43baa00ff9bda2cee4623eb186f9ed5085b Mon Sep 17 00:00:00 2001
From: Wolfram Sang <wsa at the-dreams.de>
Date: Sun, 21 Feb 2016 15:16:48 +0100
Subject: i2c: brcmstb: allocate correct amount of memory for regmap
commit 7314d22a2f5bd40468d57768be368c3d9b4bd726 upstream.
We want the size of the struct, not of a pointer to it. To be future
proof, just dereference the pointer to get the desired type.
Fixes: dd1aa2524bc5 ("i2c: brcmstb: Add Broadcom settop SoC i2c controller driver")
Acked-by: Gregory Fong <gregory.0xf0 at gmail.com>
Acked-by: Florian Fainelli <f.fainelli at gmail.com>
Reviewed-by: Kamal Dasu <kdasu.kdev at gmail.com>
Signed-off-by: Wolfram Sang <wsa at the-dreams.de>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
drivers/i2c/busses/i2c-brcmstb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
index 8e9637e..81115ab 100644
--- a/drivers/i2c/busses/i2c-brcmstb.c
+++ b/drivers/i2c/busses/i2c-brcmstb.c
@@ -562,8 +562,7 @@ static int brcmstb_i2c_probe(struct platform_device *pdev)
if (!dev)
return -ENOMEM;
- dev->bsc_regmap = devm_kzalloc(&pdev->dev, sizeof(struct bsc_regs *),
- GFP_KERNEL);
+ dev->bsc_regmap = devm_kzalloc(&pdev->dev, sizeof(*dev->bsc_regmap), GFP_KERNEL);
if (!dev->bsc_regmap)
return -ENOMEM;
--
2.7.0
More information about the kernel-team
mailing list