aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/hamradio/dmascc.c7
-rw-r--r--drivers/net/phy/spi_ks8995.c4
-rw-r--r--drivers/net/virtio_net.c4
3 files changed, 3 insertions, 12 deletions
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index ce555d9ac02c..6636022a1027 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -463,13 +463,8 @@ static int __init setup_adapter(int card_base, int type, int n)
463 463
464 /* Initialize what is necessary for write_scc and write_scc_data */ 464 /* Initialize what is necessary for write_scc and write_scc_data */
465 info = kzalloc(sizeof(struct scc_info), GFP_KERNEL | GFP_DMA); 465 info = kzalloc(sizeof(struct scc_info), GFP_KERNEL | GFP_DMA);
466 if (!info) { 466 if (!info)
467 printk(KERN_ERR "dmascc: "
468 "could not allocate memory for %s at %#3x\n",
469 hw[type].name, card_base);
470 goto out; 467 goto out;
471 }
472
473 468
474 info->dev[0] = alloc_netdev(0, "", dev_setup); 469 info->dev[0] = alloc_netdev(0, "", dev_setup);
475 if (!info->dev[0]) { 470 if (!info->dev[0]) {
diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index 41eb8ffeb53d..5c87eef40bf9 100644
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -275,10 +275,8 @@ static int ks8995_probe(struct spi_device *spi)
275 pdata = spi->dev.platform_data; 275 pdata = spi->dev.platform_data;
276 276
277 ks = kzalloc(sizeof(*ks), GFP_KERNEL); 277 ks = kzalloc(sizeof(*ks), GFP_KERNEL);
278 if (!ks) { 278 if (!ks)
279 dev_err(&spi->dev, "no memory for private data\n");
280 return -ENOMEM; 279 return -ENOMEM;
281 }
282 280
283 mutex_init(&ks->lock); 281 mutex_init(&ks->lock);
284 ks->pdata = pdata; 282 ks->pdata = pdata;
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index eda2042a6466..381a2d8d8a81 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -976,10 +976,8 @@ static void virtnet_set_rx_mode(struct net_device *dev)
976 buf = kzalloc(((uc_count + mc_count) * ETH_ALEN) + 976 buf = kzalloc(((uc_count + mc_count) * ETH_ALEN) +
977 (2 * sizeof(mac_data->entries)), GFP_ATOMIC); 977 (2 * sizeof(mac_data->entries)), GFP_ATOMIC);
978 mac_data = buf; 978 mac_data = buf;
979 if (!buf) { 979 if (!buf)
980 dev_warn(&dev->dev, "No memory for MAC address buffer\n");
981 return; 980 return;
982 }
983 981
984 sg_init_table(sg, 2); 982 sg_init_table(sg, 2);
985 983