]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
NFC: st21nfca: Remove useless IS_ERR(skb) conditions
authorChristophe Ricard <christophe.ricard@gmail.com>
Sun, 10 Aug 2014 22:04:54 +0000 (00:04 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Sun, 7 Sep 2014 22:04:22 +0000 (00:04 +0200)
skb is already verified to be not null from the below hci layer.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/st21nfca/st21nfca_dep.c

index 979c96986b34d34d6b5bd08998be7f10fecedf3c..b6de27b5011d0741e806d4312817662b04d16b54 100644 (file)
@@ -198,10 +198,6 @@ static int st21nfca_tm_recv_atr_req(struct nfc_hci_dev *hdev,
        int r;
 
        skb_trim(skb, skb->len - 1);
-       if (IS_ERR(skb)) {
-               r = PTR_ERR(skb);
-               goto exit;
-       }
 
        if (!skb->len) {
                r = -EIO;
@@ -281,11 +277,6 @@ static int st21nfca_tm_recv_psl_req(struct nfc_hci_dev *hdev,
        int r;
 
        skb_trim(skb, skb->len - 1);
-       if (IS_ERR(skb)) {
-               r = PTR_ERR(skb);
-               skb = NULL;
-               goto exit;
-       }
 
        if (!skb->len) {
                r = -EIO;
@@ -331,11 +322,6 @@ static int st21nfca_tm_recv_dep_req(struct nfc_hci_dev *hdev,
        struct st21nfca_hci_info *info = nfc_hci_get_clientdata(hdev);
 
        skb_trim(skb, skb->len - 1);
-       if (IS_ERR(skb)) {
-               r = PTR_ERR(skb);
-               skb = NULL;
-               goto exit;
-       }
 
        size = 4;
 
@@ -369,12 +355,6 @@ static int st21nfca_tm_recv_dep_req(struct nfc_hci_dev *hdev,
                break;
        }
 
-       if (IS_ERR(skb)) {
-               r = PTR_ERR(skb);
-               skb = NULL;
-               goto exit;
-       }
-
        skb_pull(skb, size);
 
        return nfc_tm_data_received(hdev->ndev, skb);