summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/platform/tegra/mc/mcerr_ecc_t18x.c2
-rw-r--r--include/linux/platform/tegra/tegra18_emc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/tegra/mc/mcerr_ecc_t18x.c b/drivers/platform/tegra/mc/mcerr_ecc_t18x.c
index 4f9f94bdb..5be8545bf 100644
--- a/drivers/platform/tegra/mc/mcerr_ecc_t18x.c
+++ b/drivers/platform/tegra/mc/mcerr_ecc_t18x.c
@@ -627,7 +627,7 @@ static int mc_ecc_err_init(struct dentry *mc_parent,
627 u32 reg_index = DT_REG_INDEX_EMC_BROADCAST; 627 u32 reg_index = DT_REG_INDEX_EMC_BROADCAST;
628 u32 ch = 0; 628 u32 ch = 0;
629 const void *prop; 629 const void *prop;
630 u32 ecc_err_irq; 630 s32 ecc_err_irq;
631 631
632 res = platform_get_resource(pdev, IORESOURCE_MEM, reg_index); 632 res = platform_get_resource(pdev, IORESOURCE_MEM, reg_index);
633 emc = devm_ioremap_resource(&pdev->dev, res); 633 emc = devm_ioremap_resource(&pdev->dev, res);
diff --git a/include/linux/platform/tegra/tegra18_emc.h b/include/linux/platform/tegra/tegra18_emc.h
index abfc43ef9..73686be7b 100644
--- a/include/linux/platform/tegra/tegra18_emc.h
+++ b/include/linux/platform/tegra/tegra18_emc.h
@@ -148,7 +148,7 @@ static inline u32 __emc_readl(int idx, u32 reg)
148 return 0; 148 return 0;
149 149
150 if ((idx != EMC_BROADCAST_CHANNEL && idx < 0) || 150 if ((idx != EMC_BROADCAST_CHANNEL && idx < 0) ||
151 idx > MAX_CHANNELS) 151 idx >= MAX_CHANNELS)
152 return 0; 152 return 0;
153 153
154 if (idx == EMC_BROADCAST_CHANNEL) 154 if (idx == EMC_BROADCAST_CHANNEL)