diff options
| author | Krzysztof Hałasa <khalasa@piap.pl> | 2015-06-08 10:37:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-07-06 08:25:47 -0300 |
| commit | dd43a6278a9dbda46f56782b54a7a59216a87d23 (patch) | |
| tree | 33b6207803847a956e0e0e33bc4abd683bc8ccec /drivers/media/pci/solo6x10/solo6x10-core.c | |
| parent | 9d1b1f61a49c66145ebbf2844124987118e65632 (diff) | |
[media] SOLO6x10: unmap registers only after free_irq()
Fixes a panic on ARM. Diagnosis by Russell King.
Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/solo6x10/solo6x10-core.c')
| -rw-r--r-- | drivers/media/pci/solo6x10/solo6x10-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c index 570d119ea18b..84627e6f7377 100644 --- a/drivers/media/pci/solo6x10/solo6x10-core.c +++ b/drivers/media/pci/solo6x10/solo6x10-core.c @@ -164,9 +164,9 @@ static void free_solo_dev(struct solo_dev *solo_dev) /* Now cleanup the PCI device */ solo_irq_off(solo_dev, ~0); - pci_iounmap(pdev, solo_dev->reg_base); if (pdev->irq) free_irq(pdev->irq, solo_dev); + pci_iounmap(pdev, solo_dev->reg_base); } pci_release_regions(pdev); |