4 files changed, 48 insertions, 27 deletions

diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c
index 11d78b43cf76..2c2fb9cfe10a 100644
--- a/drivers/nfc/pn533/i2c.c
+++ b/drivers/nfc/pn533/i2c.c
@@ -206,14 +206,6 @@ static int pn533_i2c_probe(struct i2c_client *client,
         phy->i2c_dev = client;
         i2c_set_clientdata(client, phy);
 
-        r = request_threaded_irq(client->irq, NULL, pn533_i2c_irq_thread_fn,
-                                 IRQF_TRIGGER_FALLING |
-                                 IRQF_SHARED | IRQF_ONESHOT,
-                                 PN533_I2C_DRIVER_NAME, phy);
-
-        if (r < 0)
-                nfc_err(&client->dev, "Unable to register IRQ handler\n");
-
         priv = pn533_register_device(PN533_DEVICE_PN532,
                                      PN533_NO_TYPE_B_PROTOCOLS,
                                      PN533_PROTO_REQ_ACK_RESP,
@@ -223,16 +215,32 @@ static int pn533_i2c_probe(struct i2c_client *client,
 
         if (IS_ERR(priv)) {
                 r = PTR_ERR(priv);
-                goto err_register;
+                return r;
         }
 
         phy->priv = priv;
 
+        r = request_threaded_irq(client->irq, NULL, pn533_i2c_irq_thread_fn,
+                                IRQF_TRIGGER_FALLING |
+                                IRQF_SHARED | IRQF_ONESHOT,
+                                PN533_I2C_DRIVER_NAME, phy);
+        if (r < 0) {
+                nfc_err(&client->dev, "Unable to register IRQ handler\n");
+                goto irq_rqst_err;
+        }
+
+        r = pn533_finalize_setup(priv);
+        if (r)
+                goto fn_setup_err;
+
         return 0;
 
-err_register:
+fn_setup_err:
         free_irq(client->irq, phy);
 
+irq_rqst_err:
+        pn533_unregister_device(phy->priv);
+
         return r;
 }
 
diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c
index 712aa67e1770..65bbaa5fcdda 100644
--- a/drivers/nfc/pn533/pn533.c
+++ b/drivers/nfc/pn533/pn533.c
@@ -2570,6 +2570,31 @@ static int pn533_setup(struct pn533 *dev)
         return 0;
 }
 
+int pn533_finalize_setup(struct pn533 *dev)
+{
+
+        struct pn533_fw_version fw_ver;
+        int rc;
+
+        memset(&fw_ver, 0, sizeof(fw_ver));
+
+        rc = pn533_get_firmware_version(dev, &fw_ver);
+        if (rc) {
+                nfc_err(dev->dev, "Unable to get FW version\n");
+                return rc;
+        }
+
+        nfc_info(dev->dev, "NXP PN5%02X firmware ver %d.%d now attached\n",
+                fw_ver.ic, fw_ver.ver, fw_ver.rev);
+
+        rc = pn533_setup(dev);
+        if (rc)
+                return rc;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(pn533_finalize_setup);
+
 struct pn533 *pn533_register_device(u32 device_type,
                                 u32 protocols,
                                 enum pn533_protocol_type protocol_type,
@@ -2579,7 +2604,6 @@ struct pn533 *pn533_register_device(u32 device_type,
                                 struct device *dev,
                                 struct device *parent)
 {
-        struct pn533_fw_version fw_ver;
         struct pn533 *priv;
         int rc = -ENOMEM;
 
@@ -2622,15 +2646,6 @@ struct pn533 *pn533_register_device(u32 device_type,
 
         INIT_LIST_HEAD(&priv->cmd_queue);
 
-        memset(&fw_ver, 0, sizeof(fw_ver));
-        rc = pn533_get_firmware_version(priv, &fw_ver);
-        if (rc < 0)
-                goto destroy_wq;
-
-        nfc_info(dev, "NXP PN5%02X firmware ver %d.%d now attached\n",
-                 fw_ver.ic, fw_ver.ver, fw_ver.rev);
-
-
         priv->nfc_dev = nfc_allocate_device(&pn533_nfc_ops, protocols,
                                            priv->ops->tx_header_len +
                                            PN533_CMD_DATAEXCH_HEAD_LEN,
@@ -2647,15 +2662,8 @@ struct pn533 *pn533_register_device(u32 device_type,
         if (rc)
                 goto free_nfc_dev;
 
-        rc = pn533_setup(priv);
-        if (rc)
-                goto unregister_nfc_dev;
-
         return priv;
 
-unregister_nfc_dev:
-        nfc_unregister_device(priv->nfc_dev);
-
 free_nfc_dev:
         nfc_free_device(priv->nfc_dev);
 
diff --git a/drivers/nfc/pn533/pn533.h b/drivers/nfc/pn533/pn533.h
index 553c7d171fd1..88d569666c51 100644
--- a/drivers/nfc/pn533/pn533.h
+++ b/drivers/nfc/pn533/pn533.h
@@ -231,6 +231,7 @@ struct pn533 *pn533_register_device(u32 device_type,
                                 struct device *dev,
                                 struct device *parent);
 
+int pn533_finalize_setup(struct pn533 *dev);
 void pn533_unregister_device(struct pn533 *priv);
 void pn533_recv_frame(struct pn533 *dev, struct sk_buff *skb, int status);
 
diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c
index 33ed78be2750..000159ea9c5f 100644
--- a/drivers/nfc/pn533/usb.c
+++ b/drivers/nfc/pn533/usb.c
@@ -543,6 +543,10 @@ static int pn533_usb_probe(struct usb_interface *interface,
 
         phy->priv = priv;
 
+        rc = pn533_finalize_setup(priv);
+        if (rc)
+                goto error;
+
         usb_set_intfdata(interface, phy);
 
         return 0;