diff options
Diffstat (limited to 'kernel/drivers/nfc')
| -rw-r--r-- | kernel/drivers/nfc/fdp/fdp.c | 4 | ||||
| -rw-r--r-- | kernel/drivers/nfc/mei_phy.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/drivers/nfc/fdp/fdp.c b/kernel/drivers/nfc/fdp/fdp.c index ccb07a1b1..23e537807 100644 --- a/kernel/drivers/nfc/fdp/fdp.c +++ b/kernel/drivers/nfc/fdp/fdp.c @@ -352,7 +352,7 @@ static int fdp_nci_patch_otp(struct nci_dev *ndev) { struct fdp_nci_info *info = nci_get_drvdata(ndev); struct device *dev = &info->phy->i2c_dev->dev; - u8 conn_id; + int conn_id; int r = 0; if (info->otp_version >= info->otp_patch_version) @@ -423,7 +423,7 @@ static int fdp_nci_patch_ram(struct nci_dev *ndev) { struct fdp_nci_info *info = nci_get_drvdata(ndev); struct device *dev = &info->phy->i2c_dev->dev; - u8 conn_id; + int conn_id; int r = 0; if (info->ram_version >= info->ram_patch_version) diff --git a/kernel/drivers/nfc/mei_phy.c b/kernel/drivers/nfc/mei_phy.c index 83deda4bb..6f9563a96 100644 --- a/kernel/drivers/nfc/mei_phy.c +++ b/kernel/drivers/nfc/mei_phy.c @@ -133,7 +133,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy) return -ENOMEM; bytes_recv = mei_cldev_recv(phy->cldev, (u8 *)reply, if_version_length); - if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) { + if (bytes_recv < 0 || bytes_recv < if_version_length) { pr_err("Could not read IF version\n"); r = -EIO; goto err; |