aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2014-08-10 18:04:54 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2014-09-07 18:04:22 -0400
commita51577c9e3c49dbc44c821f9e170b96bbea716e3 (patch)
tree82464c70e2847177fc7cd583f7513a91f244cdf6
parent32b41d8f7587b6e8a2cbb3a15f83c3a9687f1f17 (diff)
NFC: st21nfca: Remove useless IS_ERR(skb) conditions
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>
-rw-r--r--drivers/nfc/st21nfca/st21nfca_dep.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/nfc/st21nfca/st21nfca_dep.c b/drivers/nfc/st21nfca/st21nfca_dep.c
index 979c96986b34..b6de27b5011d 100644
--- a/drivers/nfc/st21nfca/st21nfca_dep.c
+++ b/drivers/nfc/st21nfca/st21nfca_dep.c
@@ -198,10 +198,6 @@ static int st21nfca_tm_recv_atr_req(struct nfc_hci_dev *hdev,
198 int r; 198 int r;
199 199
200 skb_trim(skb, skb->len - 1); 200 skb_trim(skb, skb->len - 1);
201 if (IS_ERR(skb)) {
202 r = PTR_ERR(skb);
203 goto exit;
204 }
205 201
206 if (!skb->len) { 202 if (!skb->len) {
207 r = -EIO; 203 r = -EIO;
@@ -281,11 +277,6 @@ static int st21nfca_tm_recv_psl_req(struct nfc_hci_dev *hdev,
281 int r; 277 int r;
282 278
283 skb_trim(skb, skb->len - 1); 279 skb_trim(skb, skb->len - 1);
284 if (IS_ERR(skb)) {
285 r = PTR_ERR(skb);
286 skb = NULL;
287 goto exit;
288 }
289 280
290 if (!skb->len) { 281 if (!skb->len) {
291 r = -EIO; 282 r = -EIO;
@@ -331,11 +322,6 @@ static int st21nfca_tm_recv_dep_req(struct nfc_hci_dev *hdev,
331 struct st21nfca_hci_info *info = nfc_hci_get_clientdata(hdev); 322 struct st21nfca_hci_info *info = nfc_hci_get_clientdata(hdev);
332 323
333 skb_trim(skb, skb->len - 1); 324 skb_trim(skb, skb->len - 1);
334 if (IS_ERR(skb)) {
335 r = PTR_ERR(skb);
336 skb = NULL;
337 goto exit;
338 }
339 325
340 size = 4; 326 size = 4;
341 327
@@ -369,12 +355,6 @@ static int st21nfca_tm_recv_dep_req(struct nfc_hci_dev *hdev,
369 break; 355 break;
370 } 356 }
371 357
372 if (IS_ERR(skb)) {
373 r = PTR_ERR(skb);
374 skb = NULL;
375 goto exit;
376 }
377
378 skb_pull(skb, size); 358 skb_pull(skb, size);
379 359
380 return nfc_tm_data_received(hdev->ndev, skb); 360 return nfc_tm_data_received(hdev->ndev, skb);