diff options
| author | Kiran Gunda <kgunda@codeaurora.org> | 2017-07-28 09:10:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 13:51:19 +0200 |
| commit | 4788e613a65df19dbfc481473859c70b23eb5404 (patch) | |
| tree | 0432d396e1add31321aa1d720dc913c28a453978 /drivers/spmi | |
| parent | spmi: pmic-arb: optimize qpnpint_irq_set_type function (diff) | |
| download | linux-4788e613a65df19dbfc481473859c70b23eb5404.tar.xz linux-4788e613a65df19dbfc481473859c70b23eb5404.zip | |
spmi: pmic-arb: fix memory allocation for mapping_table
Allocate the correct memory size (max_pmic_peripherals) for the
mapping_table that holds the apid to ppid mapping. Also use a local
variable for mapping_table for better alignment of the code.
Fixes: 987a9f128b8a ("spmi: pmic-arb: Support more than 128 peripherals")
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spmi')
| -rw-r--r-- | drivers/spmi/spmi-pmic-arb.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 0577cfd14aab..340e7b836967 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -929,6 +929,7 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) struct spmi_controller *ctrl; struct resource *res; void __iomem *core; + u32 *mapping_table; u32 channel, ee, hw_ver; int err; @@ -1038,16 +1039,14 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) } pmic_arb->ee = ee; - - pmic_arb->mapping_table = devm_kcalloc(&ctrl->dev, - PMIC_ARB_MAX_PERIPHS - 1, - sizeof(*pmic_arb->mapping_table), - GFP_KERNEL); - if (!pmic_arb->mapping_table) { + mapping_table = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PERIPHS, + sizeof(*mapping_table), GFP_KERNEL); + if (!mapping_table) { err = -ENOMEM; goto err_put_ctrl; } + pmic_arb->mapping_table = mapping_table; /* Initialize max_apid/min_apid to the opposite bounds, during * the irq domain translation, we are sure to update these */ pmic_arb->max_apid = 0; |