From: Krzysztof Hałasa <khalasa@piap.pl>
Date: Mon, 8 Jun 2015 13:37:15 +0000 (-0300)
Subject: [media] SOLO6x10: unmap registers only after free_irq()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dd43a6278a9dbda46f56782b54a7a59216a87d23;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

[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>
---

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);