commit 9f2f8ba172d9a7f7f600ced18b05f6fd52b83396
author Samuel Ortiz <sameo@linux.intel.com> Tue May 29 21:28:58 2012 +0200
committer Samuel Ortiz <sameo@linux.intel.com> Mon Jun 04 21:34:32 2012 +0200
tree 6aea00966e112cd1bbb9985a36d4d2ccc1e21c46
parent 7c2a04a933d51b45af7660bd1790339eb3c33308

NFC: Unregister device if pn533 initial configuration fails

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

drivers/nfc/pn533.c

diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 6b8a65c..2a7e4e8 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -2112,13 +2112,17 @@
 	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: