Skip to contentSkip to conversation

ARM: OMAP: fix iommu, not mailbox

PATCH New Ohad Ben-Cohen 2 participants 2 messages Mar 4, 2012 – Mar 5, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Ohad Ben-Cohen

author
#0 lore raw

PATCH 1/1 ARM: OMAP: fix iommu, not mailbox

For some weird (freudian?) reason, commit 435792d "ARM: OMAP: make iommu subsys_initcall to fix builtin omap3isp" unintentionally changed the mailbox's initcall instead of the iommu's.

Fix that.

Reported-by Fernando Guzman Lugo <[email protected]>
Signed-off-by Ohad Ben-Cohen <[email protected]>
Cc Laurent Pinchart <[email protected]>
Cc Joerg Roedel <[email protected]>
Cc Tony Lindgren <[email protected]>
---
 arch/arm/mach-omap2/mailbox.c    |    3 +--
 arch/arm/mach-omap2/omap-iommu.c |    3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/mailbox.c +1 -2
index a6db1e4..609ea2d 100644
@@ -412,8 +412,7 @@ static void __exit omap2_mbox_exit(void)
 	platform_driver_unregister(&omap2_mbox_driver);
 }
 
-/* must be ready before omap3isp is probed */
-subsys_initcall(omap2_mbox_init);
+module_init(omap2_mbox_init);
 module_exit(omap2_mbox_exit);
 
 MODULE_LICENSE("GPL v2");
arch/arm/mach-omap2/omap-iommu.c +2 -1
index b882204..ac49384 100644
@@ -150,7 +150,8 @@ err_out:
 		platform_device_put(omap_iommu_pdev[i]);
 	return err;
 }
-module_init(omap_iommu_init);
+/* must be ready before omap3isp is probed */
+subsys_initcall(omap_iommu_init);
 
 static void __exit omap_iommu_exit(void)
 {
Signature · 1 line
1.7.5.4
Applied
#1 lore raw

PATCH 1/1 ARM: OMAP: fix iommu, not mailbox

Quoted 5 lines · Ohad Ben-Cohen

For some weird (freudian?) reason, commit 435792d "ARM: OMAP: make iommu subsys_initcall to fix builtin omap3isp" unintentionally changed the mailbox's initcall instead of the iommu's.

Fix that.

Applied, thanks.

Signature · 5 lines
AMD Operating System Research Center

Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632