diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2016-04-30 09:12:41 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2016-05-04 01:32:25 +0200 |
| commit | cde4856e612111ce91258b947051a08703cd1499 (patch) | |
| tree | 8e9efafbf135da1df8830f72260fd2e854df7cad /drivers/nfc | |
| parent | d35cb20b411673820219e08c57392d18668f6217 (diff) | |
| download | lwn-cde4856e612111ce91258b947051a08703cd1499.tar.gz lwn-cde4856e612111ce91258b947051a08703cd1499.zip | |
nfc: st-nci: Simplify white list building
Simplify white list Building
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st-nci/se.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c index a53e5df803eb..79efccd13172 100644 --- a/drivers/nfc/st-nci/se.c +++ b/drivers/nfc/st-nci/se.c @@ -629,17 +629,10 @@ int st_nci_discover_se(struct nci_dev *ndev) if (test_bit(ST_NCI_FACTORY_MODE, &info->flags)) return 0; - if (info->se_info.se_status->is_ese_present && - info->se_info.se_status->is_uicc_present) { - white_list[wl_size++] = ST_NCI_UICC_HOST_ID; - white_list[wl_size++] = ST_NCI_ESE_HOST_ID; - } else if (!info->se_info.se_status->is_ese_present && - info->se_info.se_status->is_uicc_present) { + if (info->se_info.se_status->is_uicc_present) white_list[wl_size++] = ST_NCI_UICC_HOST_ID; - } else if (info->se_info.se_status->is_ese_present && - !info->se_info.se_status->is_uicc_present) { + if (info->se_info.se_status->is_ese_present) white_list[wl_size++] = ST_NCI_ESE_HOST_ID; - } if (wl_size) { r = nci_hci_set_param(ndev, NCI_HCI_ADMIN_GATE, |