Hi Samuel, On Mon, 7 May 2012 12:31:12 +0200 Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> wrote: > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> > --- > net/nfc/netlink.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c > index ebdb605..6c558bc 100644 > --- a/net/nfc/netlink.c > +++ b/net/nfc/netlink.c > @@ -197,8 +197,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)) > + goto nla_put_failure; > > genlmsg_end(msg, hdr); This has been superceded by the merge fix Dave Miller did when he merged the wireless-next tree into the net-next tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpInlL3VvImJ.pgp
Description: PGP signature
