Merge tag 'rtc-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[firefly-linux-kernel-4.4.55.git] / drivers / nfc / st-nci / se.c

diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
index 147e2d904c636956af89ba3bfb392540dbb96751..dbab722a06546ab0c2dbbdba9d87e0fb12561132 100644 (file)
--- a/drivers/nfc/st-nci/se.c
+++ b/drivers/nfc/st-nci/se.c
@@ -62,7 +62,7 @@ struct st_nci_pipe_info {
 
 #define ST_NCI_EVT_SE_HARD_RESET               0x20
 #define ST_NCI_EVT_TRANSMIT_DATA               0x10
-#define ST_NCI_EVT_WTX_REQUEST         0x11
+#define ST_NCI_EVT_WTX_REQUEST                 0x11
 #define ST_NCI_EVT_SE_SOFT_RESET               0x11
 #define ST_NCI_EVT_SE_END_OF_APDU_TRANSFER     0x21
 #define ST_NCI_EVT_HOT_PLUG                    0x03
@@ -423,7 +423,7 @@ static int st_nci_control_se(struct nci_dev *ndev, u8 se_idx,
                             u8 state)
 {
        struct st_nci_info *info = nci_get_drvdata(ndev);
-       int r;
+       int r, i;
        struct sk_buff *sk_host_list;
        u8 host_id;
 
@@ -463,14 +463,17 @@ static int st_nci_control_se(struct nci_dev *ndev, u8 se_idx,
         */
        if (info->se_info.se_status->is_ese_present &&
            info->se_info.se_status->is_uicc_present)
-               usleep_range(3000, 5000);
+               usleep_range(15000, 20000);
 
        r = nci_hci_get_param(ndev, NCI_HCI_ADMIN_GATE,
                        NCI_HCI_ADMIN_PARAM_HOST_LIST, &sk_host_list);
        if (r != NCI_HCI_ANY_OK)
                return r;
 
-       host_id = sk_host_list->data[sk_host_list->len - 1];
+       for (i = 0; i < sk_host_list->len &&
+               sk_host_list->data[i] != se_idx; i++)
+               ;
+       host_id = sk_host_list->data[i];
        kfree_skb(sk_host_list);
        if (state == ST_NCI_SE_MODE_ON && host_id == se_idx)
                return se_idx;