diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-21 15:25:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-21 15:25:47 -0400 |
| commit | 0c070900f64ef37daf198eea5ef778eb8dba5020 (patch) | |
| tree | b31a54fff10f28333daeca0d86d74bb3201110e6 /net/batman-adv/vis.c | |
| parent | f26cd41ae56f3c0ef4521505ad5b6e3940849c33 (diff) | |
| parent | 320f422f629c7ed5d07b4186aa491d1e11d18a4c (diff) | |
| download | lwn-0c070900f64ef37daf198eea5ef778eb8dba5020.tar.gz lwn-0c070900f64ef37daf198eea5ef778eb8dba5020.zip | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/vis.c')
| -rw-r--r-- | net/batman-adv/vis.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c index fb9b19fc638d..f81a6b668b0c 100644 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@ -887,10 +887,8 @@ int vis_init(struct bat_priv *bat_priv) } bat_priv->my_vis_info = kmalloc(MAX_VIS_PACKET_SIZE, GFP_ATOMIC); - if (!bat_priv->my_vis_info) { - pr_err("Can't initialize vis packet\n"); + if (!bat_priv->my_vis_info) goto err; - } bat_priv->my_vis_info->skb_packet = dev_alloc_skb(sizeof(*packet) + MAX_VIS_PACKET_SIZE + |