Revert "UBUNTU: SAUCE: ite-cir: postpone ISR registration"

BugLink: http://bugs.launchpad.net/bugs/1002880

Revert in favor of upstream stable patch (which is more extensive).

This reverts commit f3fba52b8237729ef3aaa29f91b5a4e725e0ee33.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index c8c775aba64..ecd3d028076 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1525,6 +1525,10 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
                                 dev_desc->io_region_size, ITE_DRIVER_NAME))
                 goto failure;
 
+        if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
+                        ITE_DRIVER_NAME, (void *)itdev))
+                goto failure;
+
         /* set driver data into the pnp device */
         pnp_set_drvdata(pdev, itdev);
         itdev->pdev = pdev;
@@ -1600,10 +1604,6 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         rdev->driver_name = ITE_DRIVER_NAME;
         rdev->map_name = RC_MAP_RC6_MCE;
 
-        if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
-                        ITE_DRIVER_NAME, (void *)itdev))
-                goto failure;
-
         ret = rc_register_device(rdev);
         if (ret)
                 goto failure;