From 684d61f3954b15c0949ac06628eaf02cc99028cd Mon Sep 17 00:00:00 2001 From: Eric Lapuyade Date: Wed, 17 Oct 2012 16:50:10 +0200 Subject: [PATCH] --- yaml --- r: 341503 b: refs/heads/master c: 84d4819033972f6bae2b34a8ba07c5c2e836e989 h: refs/heads/master i: 341501: 05361c3917c3444fa570d1697b2b4039aeb996bd 341499: 96f2104a06dd5a4ec8b1f6bd09b18c215b24df65 341495: f689de2e041ff0fe80afbe1e642b5ae069f9ebfc 341487: 22e397e292a9ef747a0b7332f6d3849c04f07da6 341471: 4f966480325b43f88cce325aee65340059901a8a 341439: 032aa893eb59d297be22abcc93d321ee208c255a 341375: 62328c50514c93bfad1b48e7ca8e51eced6dd62a 341247: d737b1562a2573374d36358789d0c5488dbede6d 340991: e53e95901bc0a8e222ed62784420943811cf0fdc v: v3 --- [refs] | 2 +- trunk/include/net/nfc/hci.h | 2 ++ trunk/net/nfc/hci/core.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 65d9f86299b1..fe9157551e43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74a5b96621a50a6c41377bad65149930b050df98 +refs/heads/master: 84d4819033972f6bae2b34a8ba07c5c2e836e989 diff --git a/trunk/include/net/nfc/hci.h b/trunk/include/net/nfc/hci.h index 639f50af42df..150e3caddbcf 100644 --- a/trunk/include/net/nfc/hci.h +++ b/trunk/include/net/nfc/hci.h @@ -149,6 +149,8 @@ void *nfc_hci_get_clientdata(struct nfc_hci_dev *hdev); void nfc_hci_driver_failure(struct nfc_hci_dev *hdev, int err); +int nfc_hci_result_to_errno(u8 result); + /* Host IDs */ #define NFC_HCI_HOST_CONTROLLER_ID 0x00 #define NFC_HCI_TERMINAL_HOST_ID 0x01 diff --git a/trunk/net/nfc/hci/core.c b/trunk/net/nfc/hci/core.c index 38d5f96dfd10..6825a200c4bb 100644 --- a/trunk/net/nfc/hci/core.c +++ b/trunk/net/nfc/hci/core.c @@ -33,7 +33,7 @@ /* Largest headroom needed for outgoing HCI commands */ #define HCI_CMDS_HEADROOM 1 -static int nfc_hci_result_to_errno(u8 result) +int nfc_hci_result_to_errno(u8 result) { switch (result) { case NFC_HCI_ANY_OK: @@ -46,6 +46,7 @@ static int nfc_hci_result_to_errno(u8 result) return -1; } } +EXPORT_SYMBOL(nfc_hci_result_to_errno); static void nfc_hci_msg_tx_work(struct work_struct *work) {