diff options
Diffstat (limited to 'drivers/nfc/trf7970a.c')
-rw-r--r-- | drivers/nfc/trf7970a.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 85b4d86772d8..70b0707fd9a9 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c | |||
@@ -336,7 +336,7 @@ | |||
336 | 336 | ||
337 | #define TRF7970A_NFC_TARGET_LEVEL_RFDET(v) ((v) & 0x07) | 337 | #define TRF7970A_NFC_TARGET_LEVEL_RFDET(v) ((v) & 0x07) |
338 | #define TRF7970A_NFC_TARGET_LEVEL_HI_RF BIT(3) | 338 | #define TRF7970A_NFC_TARGET_LEVEL_HI_RF BIT(3) |
339 | #define TRF7970A_NFC_TARGET_LEVEL_SDD_EN BIT(3) | 339 | #define TRF7970A_NFC_TARGET_LEVEL_SDD_EN BIT(5) |
340 | #define TRF7970A_NFC_TARGET_LEVEL_LD_S_4BYTES (0x0 << 6) | 340 | #define TRF7970A_NFC_TARGET_LEVEL_LD_S_4BYTES (0x0 << 6) |
341 | #define TRF7970A_NFC_TARGET_LEVEL_LD_S_7BYTES (0x1 << 6) | 341 | #define TRF7970A_NFC_TARGET_LEVEL_LD_S_7BYTES (0x1 << 6) |
342 | #define TRF7970A_NFC_TARGET_LEVEL_LD_S_10BYTES (0x2 << 6) | 342 | #define TRF7970A_NFC_TARGET_LEVEL_LD_S_10BYTES (0x2 << 6) |
@@ -629,7 +629,9 @@ static void trf7970a_send_upstream(struct trf7970a *trf) | |||
629 | } | 629 | } |
630 | 630 | ||
631 | if (trf->adjust_resp_len) { | 631 | if (trf->adjust_resp_len) { |
632 | skb_trim(trf->rx_skb, trf->rx_skb->len - 1); | 632 | if (trf->rx_skb) |
633 | skb_trim(trf->rx_skb, trf->rx_skb->len - 1); | ||
634 | |||
633 | trf->adjust_resp_len = false; | 635 | trf->adjust_resp_len = false; |
634 | } | 636 | } |
635 | 637 | ||