diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2016-04-30 09:12:40 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2016-05-04 01:31:56 +0200 |
| commit | d35cb20b411673820219e08c57392d18668f6217 (patch) | |
| tree | 153b4c72be4706b8e0f36fb18a07426dda48efce /drivers/nfc | |
| parent | nfc: st-nci: set is_ese_present and is_uicc_present properly (diff) | |
| download | linux-d35cb20b411673820219e08c57392d18668f6217.tar.xz linux-d35cb20b411673820219e08c57392d18668f6217.zip | |
nfc: st21nfca: 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/st21nfca/core.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/nfc/st21nfca/core.c b/drivers/nfc/st21nfca/core.c index dd8b150fbffa..25ab279606c2 100644 --- a/drivers/nfc/st21nfca/core.c +++ b/drivers/nfc/st21nfca/core.c @@ -262,17 +262,10 @@ static int st21nfca_hci_ready(struct nfc_hci_dev *hdev) int wl_size = 0; int r; - if (info->se_status->is_ese_present && - info->se_status->is_uicc_present) { + if (info->se_status->is_uicc_present) white_list[wl_size++] = NFC_HCI_UICC_HOST_ID; + if (info->se_status->is_ese_present) white_list[wl_size++] = ST21NFCA_ESE_HOST_ID; - } else if (!info->se_status->is_ese_present && - info->se_status->is_uicc_present) { - white_list[wl_size++] = NFC_HCI_UICC_HOST_ID; - } else if (info->se_status->is_ese_present && - !info->se_status->is_uicc_present) { - white_list[wl_size++] = ST21NFCA_ESE_HOST_ID; - } if (wl_size) { r = nfc_hci_set_param(hdev, NFC_HCI_ADMIN_GATE, |