From 5ad17e9415d87a0d92c6ba8c855160aec377e41a Mon Sep 17 00:00:00 2001 From: Eric Lapuyade Date: Mon, 11 Jun 2012 13:49:51 +0200 Subject: [PATCH] --- yaml --- r: 315283 b: refs/heads/master c: 456411ca812860d7ba06d3e4013ce1d8b9dbc7cd h: refs/heads/master i: 315281: 3670a5a5404dc6d0f145a3ac6fe6c74d85832d64 315279: 236ffd0d33ff15203407924ec996995282dd08e8 v: v3 --- [refs] | 2 +- trunk/include/net/nfc/nfc.h | 2 ++ trunk/net/nfc/core.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8be52bdb84dc..ba50f940f040 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c1c5b9e1d8a25268a607c762576b5c16e3e7230 +refs/heads/master: 456411ca812860d7ba06d3e4013ce1d8b9dbc7cd diff --git a/trunk/include/net/nfc/nfc.h b/trunk/include/net/nfc/nfc.h index 180964b954ab..6431f5e39022 100644 --- a/trunk/include/net/nfc/nfc.h +++ b/trunk/include/net/nfc/nfc.h @@ -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 */ diff --git a/trunk/net/nfc/core.c b/trunk/net/nfc/core.c index 4177bb5104b9..32f28326b623 100644 --- a/trunk/net/nfc/core.c +++ b/trunk/net/nfc/core.c @@ -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);