diff options
Diffstat (limited to 'net/nfc/netlink.c')
-rw-r--r-- | net/nfc/netlink.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index a1388e4efd6f..fa620d03799e 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c | |||
@@ -542,13 +542,12 @@ static int nfc_genl_dep_link_up(struct sk_buff *skb, struct genl_info *info) | |||
542 | struct nfc_dev *dev; | 542 | struct nfc_dev *dev; |
543 | int rc, tgt_idx; | 543 | int rc, tgt_idx; |
544 | u32 idx; | 544 | u32 idx; |
545 | u8 comm, rf; | 545 | u8 comm; |
546 | 546 | ||
547 | pr_debug("DEP link up\n"); | 547 | pr_debug("DEP link up\n"); |
548 | 548 | ||
549 | if (!info->attrs[NFC_ATTR_DEVICE_INDEX] || | 549 | if (!info->attrs[NFC_ATTR_DEVICE_INDEX] || |
550 | !info->attrs[NFC_ATTR_COMM_MODE] || | 550 | !info->attrs[NFC_ATTR_COMM_MODE]) |
551 | !info->attrs[NFC_ATTR_RF_MODE]) | ||
552 | return -EINVAL; | 551 | return -EINVAL; |
553 | 552 | ||
554 | idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]); | 553 | idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]); |
@@ -558,19 +557,15 @@ static int nfc_genl_dep_link_up(struct sk_buff *skb, struct genl_info *info) | |||
558 | tgt_idx = nla_get_u32(info->attrs[NFC_ATTR_TARGET_INDEX]); | 557 | tgt_idx = nla_get_u32(info->attrs[NFC_ATTR_TARGET_INDEX]); |
559 | 558 | ||
560 | comm = nla_get_u8(info->attrs[NFC_ATTR_COMM_MODE]); | 559 | comm = nla_get_u8(info->attrs[NFC_ATTR_COMM_MODE]); |
561 | rf = nla_get_u8(info->attrs[NFC_ATTR_RF_MODE]); | ||
562 | 560 | ||
563 | if (comm != NFC_COMM_ACTIVE && comm != NFC_COMM_PASSIVE) | 561 | if (comm != NFC_COMM_ACTIVE && comm != NFC_COMM_PASSIVE) |
564 | return -EINVAL; | 562 | return -EINVAL; |
565 | 563 | ||
566 | if (rf != NFC_RF_INITIATOR && comm != NFC_RF_TARGET) | ||
567 | return -EINVAL; | ||
568 | |||
569 | dev = nfc_get_device(idx); | 564 | dev = nfc_get_device(idx); |
570 | if (!dev) | 565 | if (!dev) |
571 | return -ENODEV; | 566 | return -ENODEV; |
572 | 567 | ||
573 | rc = nfc_dep_link_up(dev, tgt_idx, comm, rf); | 568 | rc = nfc_dep_link_up(dev, tgt_idx, comm); |
574 | 569 | ||
575 | nfc_put_device(dev); | 570 | nfc_put_device(dev); |
576 | 571 | ||