Skip to contentSkip to conversation

regulator: max8998 - fix memory allocation size for max8998->rdev

PATCH RESEND Applied Axel Lin 3 participants 3 messages Aug 19, 2010 – Aug 20, 2010 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH RESEND 1/1 regulator: max8998 - fix memory allocation size for max8998->rdev

We only use max8998->rdev[0] .. max8998->rdev[pdata->num_regulators-1], max8998->rdev[pdata->num_regulators] is not used.
Thus fix the memory allocation size.

Signed-off-by Axel Lin <[email protected]>
Acked-by Mark Brown <[email protected]>

---
Looks like this patch is missing. So here is a resend for Liam.

 drivers/regulator/max8998.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/max8998.c +3 -3
index ab67298..fbcb385 100644
@@ -549,7 +549,7 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev)
 	if (!max8998)
 		return -ENOMEM;
 
-	size = sizeof(struct regulator_dev *) * (pdata->num_regulators + 1);
+	size = sizeof(struct regulator_dev *) * pdata->num_regulators;
 	max8998->rdev = kzalloc(size, GFP_KERNEL);
 	if (!max8998->rdev) {
 		kfree(max8998);

@@ -583,7 +583,7 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev)
 
 	return 0;
 err:
-	for (i = 0; i <= max8998->num_regulators; i++)
+	for (i = 0; i < max8998->num_regulators; i++)
 		if (rdev[i])
 			regulator_unregister(rdev[i]);
 

@@ -599,7 +599,7 @@ static int __devexit max8998_pmic_remove(struct platform_device *pdev)
 	struct regulator_dev **rdev = max8998->rdev;
 	int i;
 
-	for (i = 0; i <= max8998->num_regulators; i++)
+	for (i = 0; i < max8998->num_regulators; i++)
 		if (rdev[i])
 			regulator_unregister(rdev[i]);
Signature · 1 line
1.7.2
Acked-by on v1 1/1
#1 lore raw
Acked-by Kyungmin Park <[email protected]>
Quoted 54 lines · Axel Lin

We only use max8998->rdev[0] .. max8998->rdev[pdata->num_regulators-1], max8998->rdev[pdata->num_regulators] is not used.
Thus fix the memory allocation size.

Signed-off-by Axel Lin <[email protected]>
Acked-by Mark Brown <[email protected]>

---
Looks like this patch is missing. So here is a resend for Liam.

 drivers/regulator/max8998.c |    6 +++---

 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/max8998.c +1 -1
index ab67298..fbcb385 100644
@@ -549,7 +549,7 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev)
        if (!max8998)
                return -ENOMEM;
 
-       size = sizeof(struct regulator_dev *) * (pdata->num_regulators + 1);
+       size = sizeof(struct regulator_dev *) * pdata->num_regulators;
        max8998->rdev = kzalloc(size, GFP_KERNEL);
        if (!max8998->rdev) {
                kfree(max8998);

@@ -583,7 +583,7 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev)
 
        return 0;

 err:
-       for (i = 0; i <= max8998->num_regulators; i++)
+       for (i = 0; i < max8998->num_regulators; i++) if (rdev[i]) regulator_unregister(rdev[i]);

drivers/regulator/max8998.c +1 -2
@@ -599,7 +599,7 @@ static int __devexit max8998_pmic_remove(struct platform_device *pdev)
        struct regulator_dev **rdev = max8998->rdev;
        int i;
 
-       for (i = 0; i <= max8998->num_regulators; i++)
+       for (i = 0; i < max8998->num_regulators; i++)
                if (rdev[i])
                        regulator_unregister(rdev[i]);
 
--

1.7.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/