diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-28 12:15:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-28 12:15:31 -0500 |
| commit | d5a74afd08738af84d51c353ac3ac200b06c51d7 (patch) | |
| tree | 1586e0f21fbd2bbbff42c6ff99837bf8ff4cf313 /arch/arm/mach-omap2 | |
| parent | 586c6e7013c8cbb8c91aaa6568ec349b1dc2c691 (diff) | |
| parent | 435792d93410f008120c4dbab148019a3cc31dbc (diff) | |
Merge tag 'iommu-fixes-v3.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
IOMMU fixes for Linux 3.3-rc5
All the fixes are for the OMAP IOMMU driver. The first patch is the
biggest one. It fixes the calls of the function omap_find_iovm_area() in
the omap-iommu-debug module which expects a 'struct device' parameter
since commit fabdbca instead of an omap_iommu handle. The
omap-iommu-debug code still passed the handle to the function which
caused a crash.
The second patch fixes a NULL pointer dereference in the OMAP code and
the third patch makes sure that the omap-iommu is initialized before the
omap-isp driver, which relies on the iommu. The last patch is only a
workaround until defered probing is implemented.
* tag 'iommu-fixes-v3.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
ARM: OMAP: make iommu subsys_initcall to fix builtin omap3isp
iommu/omap: fix NULL pointer dereference
iommu/omap: fix erroneous omap-iommu-debug API calls
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 609ea2ded7e3..a6db1e4f7b6e 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c | |||
| @@ -412,7 +412,8 @@ static void __exit omap2_mbox_exit(void) | |||
| 412 | platform_driver_unregister(&omap2_mbox_driver); | 412 | platform_driver_unregister(&omap2_mbox_driver); |
| 413 | } | 413 | } |
| 414 | 414 | ||
| 415 | module_init(omap2_mbox_init); | 415 | /* must be ready before omap3isp is probed */ |
| 416 | subsys_initcall(omap2_mbox_init); | ||
| 416 | module_exit(omap2_mbox_exit); | 417 | module_exit(omap2_mbox_exit); |
| 417 | 418 | ||
| 418 | MODULE_LICENSE("GPL v2"); | 419 | MODULE_LICENSE("GPL v2"); |