diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-08 19:30:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-08 19:30:17 -0400 |
| commit | 7c3ceb4a409e2b838700edf081d61a8a4c921e79 (patch) | |
| tree | 4dbf54cc23d2796b278e22fc6f5460b9b451c956 /net/irda | |
| parent | 54dceb008ffcbe003bea9017cad1227a83b6fc3f (diff) | |
| parent | b2238566401f01eb796e75750213c7b0fce396b2 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-3945.c
net/mac80211/mlme.c
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/irnetlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/irda/irnetlink.c b/net/irda/irnetlink.c index 9e1fb82e3220..2f05ec1037ab 100644 --- a/net/irda/irnetlink.c +++ b/net/irda/irnetlink.c | |||
| @@ -101,8 +101,8 @@ static int irda_nl_get_mode(struct sk_buff *skb, struct genl_info *info) | |||
| 101 | 101 | ||
| 102 | hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, | 102 | hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, |
| 103 | &irda_nl_family, 0, IRDA_NL_CMD_GET_MODE); | 103 | &irda_nl_family, 0, IRDA_NL_CMD_GET_MODE); |
| 104 | if (IS_ERR(hdr)) { | 104 | if (hdr == NULL) { |
| 105 | ret = PTR_ERR(hdr); | 105 | ret = -EMSGSIZE; |
| 106 | goto err_out; | 106 | goto err_out; |
| 107 | } | 107 | } |
| 108 | 108 | ||