NFC: st21nfca: Add GPIO ACPI mapping table

[karo-tx-linux.git] / drivers / nfc / fdp / i2c.c

diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c
index 712936f5d2d64a200f16a28e044aeb4a362dc7ff..e0baec848ff277d15da5bd35c91b06d2de38efb4 100644 (file)
--- a/drivers/nfc/fdp/i2c.c
+++ b/drivers/nfc/fdp/i2c.c
@@ -79,14 +79,14 @@ static void fdp_nci_i2c_add_len_lrc(struct sk_buff *skb)
 
        /* Add length header */
        len = skb->len;
-       *skb_push(skb, 1) = len & 0xff;
-       *skb_push(skb, 1) = len >> 8;
+       *(u8 *)skb_push(skb, 1) = len & 0xff;
+       *(u8 *)skb_push(skb, 1) = len >> 8;
 
        /* Compute and add lrc */
        for (i = 0; i < len + 2; i++)
                lrc ^= skb->data[i];
 
-       *skb_put(skb, 1) = lrc;
+       skb_put_u8(skb, lrc);
 }
 
 static void fdp_nci_i2c_remove_len_lrc(struct sk_buff *skb)
@@ -186,7 +186,7 @@ static int fdp_nci_i2c_read(struct fdp_i2c_phy *phy, struct sk_buff **skb)
                                goto flush;
                        }
 
-                       memcpy(skb_put(*skb, len), tmp, len);
+                       skb_put_data(*skb, tmp, len);
                        fdp_nci_i2c_dump_skb(&client->dev, "fdp_rd", *skb);
 
                        fdp_nci_i2c_remove_len_lrc(*skb);