UBUNTU: SAUCE: ite-cir: postpone ISR registration
authorLuis Henriques <luis.henriques@canonical.com>
Wed, 18 Apr 2012 16:33:32 +0000 (17:33 +0100)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Wed, 18 Apr 2012 19:43:19 +0000 (12:43 -0700)
BugLink: http://bugs.launchpad.net/bugs/984387

An early registration of an ISR was causing a crash to several users.  The
reason was that IRQs were being triggered before the driver initialisation
was completed.

This patch fixes this by moving the invocation to request_irq() to a later
stage on the driver probe function.

Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

drivers/media/rc/ite-cir.c

index 682009d..98d8ccf 100644 (file)
@@ -1521,10 +1521,6 @@ 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,6 +1596,10 @@ 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;