diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-06 16:42:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-06 16:42:19 -0700 |
| commit | a860820dce09080dc3df05064b659e931ff35a29 (patch) | |
| tree | 3a13abb743ed5235313f41f4cf33eb190d7d476a /net/wimax/op-msg.c | |
| parent | 457ca7bb6bdf39d0832d3f88c65fa367a3b20de6 (diff) | |
| parent | 94c7f2d49521b0bb3ab91cbeb3518ac34355d47f (diff) | |
Merge branch 'linux-2.6.30.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'net/wimax/op-msg.c')
| -rw-r--r-- | net/wimax/op-msg.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/wimax/op-msg.c b/net/wimax/op-msg.c index 5d149c1b5f0..9ad4d893a56 100644 --- a/net/wimax/op-msg.c +++ b/net/wimax/op-msg.c @@ -149,7 +149,8 @@ struct sk_buff *wimax_msg_alloc(struct wimax_dev *wimax_dev, } result = nla_put(skb, WIMAX_GNL_MSG_DATA, size, msg); if (result < 0) { - dev_err(dev, "no memory to add payload in attribute\n"); + dev_err(dev, "no memory to add payload (msg %p size %zu) in " + "attribute: %d\n", msg, size, result); goto error_nla_put; } genlmsg_end(skb, genl_msg); @@ -299,10 +300,10 @@ int wimax_msg(struct wimax_dev *wimax_dev, const char *pipe_name, struct sk_buff *skb; skb = wimax_msg_alloc(wimax_dev, pipe_name, buf, size, gfp_flags); - if (skb == NULL) - goto error_msg_new; - result = wimax_msg_send(wimax_dev, skb); -error_msg_new: + if (IS_ERR(skb)) + result = PTR_ERR(skb); + else + result = wimax_msg_send(wimax_dev, skb); return result; } EXPORT_SYMBOL_GPL(wimax_msg); |