uio: fix devm_request_irq usage

Commit e6789cd3df (uio: Simplify uio error
path by using devres functions) converted uio to use devm_request_irq().
This introduced a change in behaviour since the IRQ is associated with
the parent device instead of the created UIO device. The IRQ will remain
active after uio_unregister_device() is called, and some drivers will
crash because of this. The patch fixes this.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nsn.com>
Cc: stable <stable@vger.kernel.org> # 3.13
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2013-12-20 16:19:47 +02:00 committed by Greg Kroah-Hartman
parent 65861ab458
commit 632fefaf1f
1 changed files with 1 additions and 1 deletions

View File

@ -847,7 +847,7 @@ int __uio_register_device(struct module *owner,
info->uio_dev = idev; info->uio_dev = idev;
if (info->irq && (info->irq != UIO_IRQ_CUSTOM)) { if (info->irq && (info->irq != UIO_IRQ_CUSTOM)) {
ret = devm_request_irq(parent, info->irq, uio_interrupt, ret = devm_request_irq(idev->dev, info->irq, uio_interrupt,
info->irq_flags, info->name, idev); info->irq_flags, info->name, idev);
if (ret) if (ret)
goto err_request_irq; goto err_request_irq;