Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 341503
b: refs/heads/master
c: 84d4819
h: refs/heads/master
i:
  341501: 05361c3
  341499: 96f2104
  341495: f689de2
  341487: 22e397e
  341471: 4f96648
  341439: 032aa89
  341375: 62328c5
  341247: d737b15
  340991: e53e959
v: v3
  • Loading branch information
Eric Lapuyade authored and Samuel Ortiz committed Nov 19, 2012
1 parent 755bb01 commit 684d61f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 74a5b96621a50a6c41377bad65149930b050df98
refs/heads/master: 84d4819033972f6bae2b34a8ba07c5c2e836e989
2 changes: 2 additions & 0 deletions trunk/include/net/nfc/hci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion trunk/net/nfc/hci/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
{
Expand Down

0 comments on commit 684d61f

Please sign in to comment.