diff options
| author | Joe Perches <joe@perches.com> | 2010-08-11 07:02:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-17 17:45:14 -0700 |
| commit | baeb2ffab4e67bb9174e6166e070a9a8ec94b0f6 (patch) | |
| tree | 08259e966cc0cacc58ed58a4865fe861cc255241 /drivers/net/wireless/ipw2x00/ipw2100.c | |
| parent | 5a68d5ee000bb784c4856391b4861739c8bbd341 (diff) | |
| download | op-kernel-dev-baeb2ffab4e67bb9174e6166e070a9a8ec94b0f6.zip op-kernel-dev-baeb2ffab4e67bb9174e6166e070a9a8ec94b0f6.tar.gz | |
drivers/net: Convert unbounded kzalloc calls to kcalloc
These changes may be slightly safer in some instances.
There are other kzalloc calls with a multiply, but those
calls are typically "small fixed #" * sizeof(some pointer)"
and those are not converted.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 1189dbb..0c67b17 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -1921,9 +1921,9 @@ static int ipw2100_net_init(struct net_device *dev) bg_band->band = IEEE80211_BAND_2GHZ; bg_band->n_channels = geo->bg_channels; - bg_band->channels = - kzalloc(geo->bg_channels * - sizeof(struct ieee80211_channel), GFP_KERNEL); + bg_band->channels = kcalloc(geo->bg_channels, + sizeof(struct ieee80211_channel), + GFP_KERNEL); if (!bg_band->channels) { ipw2100_down(priv); return -ENOMEM; |
