From 42f1b1918292ea8bfedb5455efab23f847d11ea7 Mon Sep 17 00:00:00 2001
From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Fri, 2 Nov 2012 09:13:55 -0300
Subject: [PATCH] --- yaml --- r: 357095 b: refs/heads/master c:
 d62b6818477704683d00c680335eff5833bd3906 h: refs/heads/master i:   357093:
 ea85d5ef490324ef676fa45ee6bdb5d58483096b   357091:
 9da750e2f0a15d9cbe17528f5bb99611660bc265   357087:
 a168358f513c3eef97b57e05a47aa08c0fb17280 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/media/rc/fintek-cir.c  | 4 +++-
 trunk/drivers/media/rc/nuvoton-cir.c | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 09d56bbbf794..96005ea75611 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70ef69915b1fba4ad85aebe530caf156a144c2e5
+refs/heads/master: d62b6818477704683d00c680335eff5833bd3906
diff --git a/trunk/drivers/media/rc/fintek-cir.c b/trunk/drivers/media/rc/fintek-cir.c
index 3d5e57cacf31..5eefe65760a4 100644
--- a/trunk/drivers/media/rc/fintek-cir.c
+++ b/trunk/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/trunk/drivers/media/rc/nuvoton-cir.c b/trunk/drivers/media/rc/nuvoton-cir.c
index 3477e231c182..c6441e690dd4 100644
--- a/trunk/drivers/media/rc/nuvoton-cir.c
+++ b/trunk/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);