projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c2a04a
)
NFC: Unregister device if pn533 initial configuration fails
author
Samuel Ortiz
<sameo@linux.intel.com>
Tue, 29 May 2012 19:28:58 +0000
(21:28 +0200)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Mon, 4 Jun 2012 19:34:32 +0000
(21:34 +0200)
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/pn533.c
patch
|
blob
|
history
diff --git
a/drivers/nfc/pn533.c
b/drivers/nfc/pn533.c
index
6b8a65c
..
2a7e4e8
100644
(file)
--- a/
drivers/nfc/pn533.c
+++ b/
drivers/nfc/pn533.c
@@
-2112,13
+2112,17
@@
static int pn533_probe(struct usb_interface *interface,
if (rc) {
nfc_dev_err(&dev->interface->dev, "Error on setting MAX_RETRIES"
" config");
- goto
free
_nfc_dev;
+ goto
unregister
_nfc_dev;
}
return 0;
+unregister_nfc_dev:
+ nfc_unregister_device(dev->nfc_dev);
+
free_nfc_dev:
nfc_free_device(dev->nfc_dev);
+
destroy_wq:
destroy_workqueue(dev->wq);
error: