Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 352062
b: refs/heads/master
c: e68ed8f
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Feb 4, 2013
1 parent c1cb96a commit b0093bf
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0d2e7a5c608063f72048899d20505c2ee130566c
refs/heads/master: e68ed8f0d8f5b0f59c0f1098e37007f4e6c9ef86
7 changes: 1 addition & 6 deletions trunk/drivers/net/hamradio/dmascc.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,13 +463,8 @@ static int __init setup_adapter(int card_base, int type, int n)

/* Initialize what is necessary for write_scc and write_scc_data */
info = kzalloc(sizeof(struct scc_info), GFP_KERNEL | GFP_DMA);
if (!info) {
printk(KERN_ERR "dmascc: "
"could not allocate memory for %s at %#3x\n",
hw[type].name, card_base);
if (!info)
goto out;
}


info->dev[0] = alloc_netdev(0, "", dev_setup);
if (!info->dev[0]) {
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/net/phy/spi_ks8995.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,8 @@ static int ks8995_probe(struct spi_device *spi)
pdata = spi->dev.platform_data;

ks = kzalloc(sizeof(*ks), GFP_KERNEL);
if (!ks) {
dev_err(&spi->dev, "no memory for private data\n");
if (!ks)
return -ENOMEM;
}

mutex_init(&ks->lock);
ks->pdata = pdata;
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/net/virtio_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -976,10 +976,8 @@ static void virtnet_set_rx_mode(struct net_device *dev)
buf = kzalloc(((uc_count + mc_count) * ETH_ALEN) +
(2 * sizeof(mac_data->entries)), GFP_ATOMIC);
mac_data = buf;
if (!buf) {
dev_warn(&dev->dev, "No memory for MAC address buffer\n");
if (!buf)
return;
}

sg_init_table(sg, 2);

Expand Down

0 comments on commit b0093bf

Please sign in to comment.