diff options
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 12 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index a8259cc19a63..094d26c51816 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | |||
@@ -280,13 +280,10 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter) | |||
280 | 280 | ||
281 | } | 281 | } |
282 | rds_ring->rx_buf_arr = vzalloc(RCV_BUFF_RINGSIZE(rds_ring)); | 282 | rds_ring->rx_buf_arr = vzalloc(RCV_BUFF_RINGSIZE(rds_ring)); |
283 | if (rds_ring->rx_buf_arr == NULL) { | 283 | if (rds_ring->rx_buf_arr == NULL) |
284 | printk(KERN_ERR "%s: Failed to allocate " | ||
285 | "rx buffer ring %d\n", | ||
286 | netdev->name, ring); | ||
287 | /* free whatever was already allocated */ | 284 | /* free whatever was already allocated */ |
288 | goto err_out; | 285 | goto err_out; |
289 | } | 286 | |
290 | INIT_LIST_HEAD(&rds_ring->free_list); | 287 | INIT_LIST_HEAD(&rds_ring->free_list); |
291 | /* | 288 | /* |
292 | * Now go through all of them, set reference handles | 289 | * Now go through all of them, set reference handles |
@@ -480,11 +477,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter) | |||
480 | } | 477 | } |
481 | 478 | ||
482 | buf = kcalloc(n, sizeof(struct crb_addr_pair), GFP_KERNEL); | 479 | buf = kcalloc(n, sizeof(struct crb_addr_pair), GFP_KERNEL); |
483 | if (buf == NULL) { | 480 | if (buf == NULL) |
484 | printk("%s: netxen_pinit_from_rom: Unable to calloc memory.\n", | ||
485 | netxen_nic_driver_name); | ||
486 | return -ENOMEM; | 481 | return -ENOMEM; |
487 | } | ||
488 | 482 | ||
489 | for (i = 0; i < n; i++) { | 483 | for (i = 0; i < n; i++) { |
490 | if (netxen_rom_fast_read(adapter, 8*i + 4*offset, &val) != 0 || | 484 | if (netxen_rom_fast_read(adapter, 8*i + 4*offset, &val) != 0 || |
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c index fca804f36d61..58185b604b72 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | |||
@@ -1824,10 +1824,8 @@ void ql_dump_hw_cb(struct ql_adapter *qdev, int size, u32 bit, u16 q_id) | |||
1824 | pr_err("%s: Enter\n", __func__); | 1824 | pr_err("%s: Enter\n", __func__); |
1825 | 1825 | ||
1826 | ptr = kmalloc(size, GFP_ATOMIC); | 1826 | ptr = kmalloc(size, GFP_ATOMIC); |
1827 | if (ptr == NULL) { | 1827 | if (ptr == NULL) |
1828 | pr_err("%s: Couldn't allocate a buffer\n", __func__); | ||
1829 | return; | 1828 | return; |
1830 | } | ||
1831 | 1829 | ||
1832 | if (ql_write_cfg(qdev, ptr, size, bit, q_id)) { | 1830 | if (ql_write_cfg(qdev, ptr, size, bit, q_id)) { |
1833 | pr_err("%s: Failed to upload control block!\n", __func__); | 1831 | pr_err("%s: Failed to upload control block!\n", __func__); |