projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9d1b1f6)
[media] SOLO6x10: unmap registers only after free_irq()
authorKrzysztof Hałasa <khalasa@piap.pl>
Mon, 8 Jun 2015 13:37:15 +0000 (10:37 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 6 Jul 2015 11:25:47 +0000 (08:25 -0300)
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>
drivers/media/pci/solo6x10/solo6x10-core.c patch | blob | blame | history

diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
index 570d119ea18b6667cf906a1023ba2240e4c63e11..84627e6f7377dfaaddc48a507f0573404a36ffb4 100644 (file)
--- 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);