39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From: Himangi Saraogi <himangi774@gmail.com>
|
|
Date: Sat, 12 Jul 2014 01:12:43 +0530
|
|
Subject: [30/31] thunderbolt: Use kcalloc
|
|
Origin: https://git.kernel.org/linus/2a211f320ee3d86835b40efd2948642482d3c933
|
|
|
|
The advantage of kcalloc is, that will prevent integer overflows
|
|
which could result from the multiplication of number of elements
|
|
and size and it is also a bit nicer to read.
|
|
|
|
Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
|
|
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
|
|
Acked-by: Andreas Noever <andreas.noever@gmail.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/thunderbolt/nhi.c | 10 ++++------
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
|
|
index ce72f31..c68fe12 100644
|
|
--- a/drivers/thunderbolt/nhi.c
|
|
+++ b/drivers/thunderbolt/nhi.c
|
|
@@ -569,12 +569,10 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
nhi->hop_count);
|
|
INIT_WORK(&nhi->interrupt_work, nhi_interrupt_work);
|
|
|
|
- nhi->tx_rings = devm_kzalloc(&pdev->dev,
|
|
- nhi->hop_count * sizeof(*nhi->tx_rings),
|
|
- GFP_KERNEL);
|
|
- nhi->rx_rings = devm_kzalloc(&pdev->dev,
|
|
- nhi->hop_count * sizeof(*nhi->rx_rings),
|
|
- GFP_KERNEL);
|
|
+ nhi->tx_rings = devm_kcalloc(&pdev->dev, nhi->hop_count,
|
|
+ sizeof(*nhi->tx_rings), GFP_KERNEL);
|
|
+ nhi->rx_rings = devm_kcalloc(&pdev->dev, nhi->hop_count,
|
|
+ sizeof(*nhi->rx_rings), GFP_KERNEL);
|
|
if (!nhi->tx_rings || !nhi->rx_rings)
|
|
return -ENOMEM;
|
|
|