2 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c
index 3d5e57cacf31..5eefe65760a4 100644
--- a/drivers/media/rc/fintek-cir.c
+++ b/drivers/media/rc/fintek-cir.c
@@ -557,6 +557,8 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
         /* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */
         rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD);
 
+        fintek->rdev = rdev;
+
         ret = -EBUSY;
         /* now claim resources */
         if (!request_region(fintek->cir_addr,
@@ -572,7 +574,7 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
                 goto exit_free_irq;
 
         device_init_wakeup(&pdev->dev, true);
-        fintek->rdev = rdev;
+
         fit_pr(KERN_NOTICE, "driver has been successfully loaded\n");
         if (debug)
                 cir_dump_regs(fintek);
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 3477e231c182..c6441e690dd4 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -1065,6 +1065,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
         /* tx bits */
         rdev->tx_resolution = XYZ;
 #endif
+        nvt->rdev = rdev;
 
         ret = -EBUSY;
         /* now claim resources */
@@ -1089,7 +1090,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
                 goto exit_free_wake_irq;
 
         device_init_wakeup(&pdev->dev, true);
-        nvt->rdev = rdev;
+
         nvt_pr(KERN_NOTICE, "driver has been successfully loaded\n");
         if (debug) {
                 cir_dump_regs(nvt);