diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-08-25 14:28:10 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-22 23:29:19 -0700 |
| commit | 54448c3925c50557ffddcccf81a64d7c0258e051 (patch) | |
| tree | 8deff4df608cdc800451d5f6be76e2afdcb07fe3 /arch/arm/mach-tegra/common-t3.c | |
| parent | a7b9f2652209fc244fca17c3f9702906d402289c (diff) | |
ARM: tegra: Fix warnings
Change-Id: Ic2cecccf0f4f6e6ca612af2ee07acdbca2ce07a5
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/49281
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R59e04e0a46099403284a036de7f35d21c6188d81
Diffstat (limited to 'arch/arm/mach-tegra/common-t3.c')
| -rw-r--r-- | arch/arm/mach-tegra/common-t3.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/common-t3.c b/arch/arm/mach-tegra/common-t3.c index 10a7155f8949..4c324b2f63dd 100644 --- a/arch/arm/mach-tegra/common-t3.c +++ b/arch/arm/mach-tegra/common-t3.c @@ -185,10 +185,11 @@ out: return IRQ_HANDLED; } -static void __init tegra30_mc_init(void) +static int __init tegra30_mc_init(void) { void __iomem *mc = IO_ADDRESS(TEGRA_MC_BASE); u32 reg; + int ret = 0; reg = 0x0A7F1010; writel(reg, mc + MC_RESERVED_RSV); @@ -200,10 +201,13 @@ static void __init tegra30_mc_init(void) if (request_irq(INT_MC_GENERAL, tegra_mc_error_isr, 0, "mc_status", NULL)) { pr_err("%s: unable to register MC error interrupt\n", __func__); + ret = -ENXIO; } else { reg = MC_INT_DECERR_EMEM | MC_INT_SECURITY_VIOLATION | MC_INT_INVALID_SMMU_PAGE; writel(reg, mc + MC_INT_MASK); } + + return ret; } arch_initcall(tegra_mc_init); |