lkml.org 
[lkml]   [2012]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the wireless-next tree with the net-next tree
Hi John,

On Fri, 13 Apr 2012 12:41:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
> index 539d041..24d8d12 100644
> --- a/net/nfc/netlink.c
> +++ b/net/nfc/netlink.c
> @@ -202,8 +202,10 @@ int nfc_genl_target_lost(struct nfc_dev *dev, u32 target_idx)
> if (!hdr)
> goto free_msg;
>
> - NLA_PUT_STRING(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev));
> - NLA_PUT_U32(msg, NFC_ATTR_TARGET_INDEX, target_idx);
> + if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)))
> + goto nla_put_failure;
> + if (nla_put_u32((msg, NFC_ATTR_TARGET_INDEX, target_idx))
^
I removed this extra parenthesis. :-(

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-04-13 04:51    [W:0.021 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site