Message ID | 1334776157-32083-2-git-send-email-luis.henriques@canonical.com |
---|---|
State | New |
Headers | show |
On 04/18/2012 12:09 PM, Luis Henriques wrote: > BugLink: http://bugs.launchpad.net/bugs/972723 > > 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> > --- > drivers/media/rc/ite-cir.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c > index 682009d..98d8ccf 100644 > --- a/drivers/media/rc/ite-cir.c > +++ b/drivers/media/rc/ite-cir.c > @@ -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;
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c index 682009d..98d8ccf 100644 --- a/drivers/media/rc/ite-cir.c +++ b/drivers/media/rc/ite-cir.c @@ -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;
BugLink: http://bugs.launchpad.net/bugs/972723 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> --- drivers/media/rc/ite-cir.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)