---

yaml --- r: 314196 b: refs/heads/master c: 9f2f8ba h: refs/heads/master v: v3
git-mirror · Jun 4, 2012 · d1e8e3b · d1e8e3b
1 parent 2725358
commit d1e8e3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c2a04a933d51b45af7660bd1790339eb3c33308
+refs/heads/master: 9f2f8ba172d9a7f7f600ced18b05f6fd52b83396
diff --git a/trunk/drivers/nfc/pn533.c b/trunk/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: