1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/irqchip/qcom-irq-combiner.c b/drivers/irqchip/qcom-irq-combiner.c
index 067337ab3f20..d88e993aa66d 100644
--- a/drivers/irqchip/qcom-irq-combiner.c
+++ b/drivers/irqchip/qcom-irq-combiner.c
@@ -229,7 +229,6 @@ static int get_registers(struct platform_device *pdev, struct combiner *comb)
 static int __init combiner_probe(struct platform_device *pdev)
 {
         struct combiner *combiner;
-        size_t alloc_sz;
         int nregs;
         int err;
 
@@ -239,8 +238,8 @@ static int __init combiner_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        alloc_sz = sizeof(*combiner) + sizeof(struct combiner_reg) * nregs;
-        combiner = devm_kzalloc(&pdev->dev, alloc_sz, GFP_KERNEL);
+        combiner = devm_kzalloc(&pdev->dev, struct_size(combiner, regs, nregs),
+                                GFP_KERNEL);
         if (!combiner)
                 return -ENOMEM;