iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] rc: Set rdev before irq setup

Browse Source 
This fixes a problem in fintek-cir and nuvoton-cir where the
irq handler would trigger during module load before the rdev member was
set, causing a NULL pointer crash.
It seems this crash is very reproducible (just bombard the receiver with
IR signals during module load), probably because when request_irq is
called, any pending intterupt is handled immediately, before
request_irq returns and rdev can be set.
This same crash was supposed to be fixed by commit
9ef449c6b31bb6a8e6dedc24de475a3b8c79be20 ("[media] rc: Postpone ISR
registration"), but the crash was still observed on the nuvoton-cir
driver.
This commit was tested on nuvoton-cir only.

Cc: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Matthijs Kooijman 2012-11-02 09:13:55 -03:00 committed by Mauro Carvalho Chehab
parent 70ef69915b
commit d62b681847
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/rc/fintek-cir.c
View File

@ -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 */ /* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */
rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD); rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD);
fintek->rdev = rdev;
ret = -EBUSY; ret = -EBUSY;
/* now claim resources */ /* now claim resources */
if (!request_region(fintek->cir_addr, 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; goto exit_free_irq;
device_init_wakeup(&pdev->dev, true); device_init_wakeup(&pdev->dev, true);
fintek->rdev = rdev;
fit_pr(KERN_NOTICE, "driver has been successfully loaded\n"); fit_pr(KERN_NOTICE, "driver has been successfully loaded\n");
if (debug) if (debug)
cir_dump_regs(fintek); cir_dump_regs(fintek);

3
drivers/media/rc/nuvoton-cir.c
View File

@ -1065,6 +1065,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
/* tx bits */ /* tx bits */
rdev->tx_resolution = XYZ; rdev->tx_resolution = XYZ;
#endif #endif
nvt->rdev = rdev;
ret = -EBUSY; ret = -EBUSY;
/* now claim resources */ /* 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; goto exit_free_wake_irq;
device_init_wakeup(&pdev->dev, true); device_init_wakeup(&pdev->dev, true);
nvt->rdev = rdev;
nvt_pr(KERN_NOTICE, "driver has been successfully loaded\n"); nvt_pr(KERN_NOTICE, "driver has been successfully loaded\n");
if (debug) { if (debug) {
cir_dump_regs(nvt); cir_dump_regs(nvt);