diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-17 14:43:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-17 14:43:17 -0500 |
| commit | 7916a075571f0ccd0830cf3da293188a8b6045e3 (patch) | |
| tree | 119c5bb9e513c8205efed485c2dc7b8271123326 /net/nfc/hci | |
| parent | cf84eb0b09c0f09b4c70a648b9dfeec78be61f07 (diff) | |
| parent | e4e19c031901e95dc7d1cf0a2c9c50525d71651f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/nfc/hci')
| -rw-r--r-- | net/nfc/hci/core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c index 3b9610031baa..d45b638e77c7 100644 --- a/net/nfc/hci/core.c +++ b/net/nfc/hci/core.c | |||
| @@ -335,11 +335,8 @@ exit: | |||
| 335 | kfree_skb(skb); | 335 | kfree_skb(skb); |
| 336 | 336 | ||
| 337 | exit_noskb: | 337 | exit_noskb: |
| 338 | if (r) { | 338 | if (r) |
| 339 | /* TODO: There was an error dispatching the event, | 339 | nfc_hci_driver_failure(hdev, r); |
| 340 | * how to propagate up to nfc core? | ||
| 341 | */ | ||
| 342 | } | ||
| 343 | } | 340 | } |
| 344 | 341 | ||
| 345 | static void nfc_hci_cmd_timeout(unsigned long data) | 342 | static void nfc_hci_cmd_timeout(unsigned long data) |