Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

1 files changed, 18 insertions, 18 deletions

diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 144f3f55d765..8b2c071ac0ab 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -1021,24 +1021,6 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         spin_lock_init(&nvt->nvt_lock);
         spin_lock_init(&nvt->tx.lock);
 
-        ret = -EBUSY;
-        /* now claim resources */
-        if (!request_region(nvt->cir_addr,
-                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
-                goto failure;
-
-        if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,
-                        NVT_DRIVER_NAME, (void *)nvt))
-                goto failure;
-
-        if (!request_region(nvt->cir_wake_addr,
-                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
-                goto failure;
-
-        if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,
-                        NVT_DRIVER_NAME, (void *)nvt))
-                goto failure;
-
         pnp_set_drvdata(pdev, nvt);
         nvt->pdev = pdev;
 
@@ -1085,6 +1067,24 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         rdev->tx_resolution = XYZ;
 #endif
 
+        ret = -EBUSY;
+        /* now claim resources */
+        if (!request_region(nvt->cir_addr,
+                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
+                goto failure;
+
+        if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,
+                        NVT_DRIVER_NAME, (void *)nvt))
+                goto failure;
+
+        if (!request_region(nvt->cir_wake_addr,
+                            CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
+                goto failure;
+
+        if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,
+                        NVT_DRIVER_NAME, (void *)nvt))
+                goto failure;
+
         ret = rc_register_device(rdev);
         if (ret)
                 goto failure;