Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

s2io.c: use kzalloc

Browse source 
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2009-08-24 17:29:43 +00:00 committed by David S. Miller
parent 4f87032021
commit 44364a035a
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/s2io.c
View file

@ -3834,7 +3834,7 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
int size; int size;
size = nic->num_entries * sizeof(struct msix_entry); size = nic->num_entries * sizeof(struct msix_entry);
nic->entries = kmalloc(size, GFP_KERNEL); nic->entries = kzalloc(size, GFP_KERNEL);
if (!nic->entries) { if (!nic->entries) {
DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", \ DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", \
__func__); __func__);
@ -3843,10 +3843,8 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
} }
nic->mac_control.stats_info->sw_stat.mem_allocated += size; nic->mac_control.stats_info->sw_stat.mem_allocated += size;
memset(nic->entries, 0, size);
size = nic->num_entries * sizeof(struct s2io_msix_entry); size = nic->num_entries * sizeof(struct s2io_msix_entry);
nic->s2io_entries = kmalloc(size, GFP_KERNEL); nic->s2io_entries = kzalloc(size, GFP_KERNEL);
if (!nic->s2io_entries) { if (!nic->s2io_entries) {
DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n",
__func__); __func__);
@ -3857,7 +3855,6 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
return -ENOMEM; return -ENOMEM;
} }
nic->mac_control.stats_info->sw_stat.mem_allocated += size; nic->mac_control.stats_info->sw_stat.mem_allocated += size;
memset(nic->s2io_entries, 0, size);
nic->entries[0].entry = 0; nic->entries[0].entry = 0;
nic->s2io_entries[0].entry = 0; nic->s2io_entries[0].entry = 0;