Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 315283
b: refs/heads/master
c: 456411c
h: refs/heads/master
i:
  315281: 3670a5a
  315279: 236ffd0
v: v3
  • Loading branch information
Eric Lapuyade authored and John W. Linville committed Jul 9, 2012
1 parent c8a27f4 commit 5ad17e9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6c1c5b9e1d8a25268a607c762576b5c16e3e7230
refs/heads/master: 456411ca812860d7ba06d3e4013ce1d8b9dbc7cd
2 changes: 2 additions & 0 deletions trunk/include/net/nfc/nfc.h
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,6 @@ int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,
int nfc_tm_deactivated(struct nfc_dev *dev);
int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb);

void nfc_driver_failure(struct nfc_dev *dev, int err);

#endif /* __NET_NFC_H */
10 changes: 10 additions & 0 deletions trunk/net/nfc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,16 @@ int nfc_target_lost(struct nfc_dev *dev, u32 target_idx)
}
EXPORT_SYMBOL(nfc_target_lost);

void nfc_driver_failure(struct nfc_dev *dev, int err)
{
/*
* TODO: if polling is active, send empty target_found
* or else do whatever makes sense to let user space
* know this device needs to be closed and reinitialized.
*/
}
EXPORT_SYMBOL(nfc_driver_failure);

static void nfc_release(struct device *d)
{
struct nfc_dev *dev = to_nfc_dev(d);
Expand Down

0 comments on commit 5ad17e9

Please sign in to comment.