From patchwork Tue Jan 18 21:45:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Hostettler X-Patchwork-Id: 487651 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0ILjek4027530 for ; Tue, 18 Jan 2011 21:45:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752397Ab1ARVp0 (ORCPT ); Tue, 18 Jan 2011 16:45:26 -0500 Received: from moutng.kundenserver.de ([212.227.126.186]:55204 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752050Ab1ARVpY (ORCPT ); Tue, 18 Jan 2011 16:45:24 -0500 Received: from localhost (dslb-084-063-098-161.pools.arcor-ip.net [84.63.98.161]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0LvzHJ-1QKXFC1kcP-017VPe; Tue, 18 Jan 2011 22:45:19 +0100 From: Martin Hostettler To: linux-omap@vger.kernel.org, Tony Lindgren Cc: Hiroshi DOYU , Martin Hostettler Subject: [PATCH] omap iommu: Gracefully fail iommu_enable if no arch_iommu is registered. Date: Tue, 18 Jan 2011 22:45:04 +0100 Message-Id: <1295387104-17885-1-git-send-email-martin@neutronstar.dyndns.org> X-Mailer: git-send-email 1.7.1 X-Provags-ID: V02:K0:b8LZrFKsXxm3NKFSrX8NgddJ3sC3GndxMbLKQbJ1z4R p+QEKCoXI2DS5EeulEuxhDX4pA/PnzfcJRr6beihWVQEsHDaZo ktxEt3Y2Y+m0rPSm7q/vrQpmhkWNigt0xNC9JkSraGo1Ed9AoQ fDWkUw/PJqVfP/wwPbdJ9DI1wGO3552fuJuDaFxdd25OncNFhM +rwVKOniGgCxXZDCgKSnwzkwIOum/AvzlrvQt2OHms= Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 18 Jan 2011 21:45:50 +0000 (UTC) diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c index 6cd151b..c1c6887 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 -ENODEV; + clk_enable(obj->clk); err = arch_iommu->enable(obj);