projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
[cascardo/linux.git]
/
net
/
nfc
/
nci
/
lib.c
diff --git
a/net/nfc/nci/lib.c
b/net/nfc/nci/lib.c
index
b19dc2f
..
6a63e5e
100644
(file)
--- a/
net/nfc/nci/lib.c
+++ b/
net/nfc/nci/lib.c
@@
-42,12
+42,9
@@
int nci_to_errno(__u8 code)
case NCI_STATUS_REJECTED:
return -EBUSY;
case NCI_STATUS_REJECTED:
return -EBUSY;
- case NCI_STATUS_
MESSAG
E_CORRUPTED:
+ case NCI_STATUS_
RF_FRAM
E_CORRUPTED:
return -EBADMSG;
return -EBADMSG;
- case NCI_STATUS_BUFFER_FULL:
- return -ENOBUFS;
-
case NCI_STATUS_NOT_INITIALIZED:
return -EHOSTDOWN;
case NCI_STATUS_NOT_INITIALIZED:
return -EHOSTDOWN;
@@
-80,12
+77,6
@@
int nci_to_errno(__u8 code)
case NCI_STATUS_NFCEE_TIMEOUT_ERROR:
return -ETIMEDOUT;
case NCI_STATUS_NFCEE_TIMEOUT_ERROR:
return -ETIMEDOUT;
- case NCI_STATUS_RF_LINK_LOSS_ERROR:
- return -ENOLINK;
-
- case NCI_STATUS_MAX_ACTIVE_NFCEE_INTERFACES_REACHED:
- return -EDQUOT;
-
case NCI_STATUS_FAILED:
default:
return -ENOSYS;
case NCI_STATUS_FAILED:
default:
return -ENOSYS;