linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
To: linux-omap@vger.kernel.org
Cc: laurent.pinchart@ideasonboard.com, david.cohen@nokia.com,
	hiroshi.doyu@nokia.com
Subject: [PATCH 1/4] omap iommu: Check existence of arch_iommu
Date: Fri, 25 Mar 2011 17:17:59 +0200	[thread overview]
Message-ID: <1301066282-8040-1-git-send-email-sakari.ailus@maxwell.research.nokia.com> (raw)
In-Reply-To: <4D8CB217.1050909@maxwell.research.nokia.com>

Check that the arch_iommu has been installed before trying to use it. This
will lead to kernel oops if the arch_iommu isn't there.

Signed-off-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
---
 arch/arm/plat-omap/iommu.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c
index b1107c0..f0fea0b 100644
--- a/arch/arm/plat-omap/iommu.c
+++ b/arch/arm/plat-omap/iommu.c
@@ -104,6 +104,9 @@ static int iommu_enable(struct iommu *obj)
 	if (!obj)
 		return -EINVAL;
 
+	if (!arch_iommu)
+		return -ENOENT;
+
 	clk_enable(obj->clk);
 
 	err = arch_iommu->enable(obj);
-- 
1.7.2.3


  reply	other threads:[~2011-03-25 15:18 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-25 15:17 [PATCH 0/4] iommu: Prevent oops in iommu_get() and while arch_iommu is in use Sakari Ailus
2011-03-25 15:17 ` Sakari Ailus [this message]
2011-03-25 15:18 ` [PATCH 2/4] omap iommu: Add module information to struct iommu_functions Sakari Ailus
2011-03-25 15:18 ` [PATCH 3/4] omap2 iommu: Set module information in omap2_iommu_ops Sakari Ailus
2011-03-25 15:18 ` [PATCH 4/4] omap iommu: Prevent iommu implementations from being unloaded while in use Sakari Ailus
2011-03-25 15:44 ` [PATCH 0/4] iommu: Prevent oops in iommu_get() and while arch_iommu is " David Cohen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1301066282-8040-1-git-send-email-sakari.ailus@maxwell.research.nokia.com \
    --to=sakari.ailus@maxwell.research.nokia.com \
    --cc=david.cohen@nokia.com \
    --cc=hiroshi.doyu@nokia.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).