NFC: Unregister device if pn533 initial configuration fails

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
git-mirror · Jun 4, 2012 · 9f2f8ba · 9f2f8ba
1 parent 7c2a04a
commit 9f2f8ba
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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: