Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
nfc
/
fdp
/
fdp.c
diff --git
a/kernel/drivers/nfc/fdp/fdp.c
b/kernel/drivers/nfc/fdp/fdp.c
index
ccb07a1
..
23e5378
100644
(file)
--- 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;
{
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)
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;
{
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)
int r = 0;
if (info->ram_version >= info->ram_patch_version)