| Message ID | 20160401193242.F963.4A936039@socionext.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2016-04-01 19:32 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko@socionext.com>: > This patch fixes condition whether the specified address ranges > overlap each other. > > Fixes: 4b7f48d395a7 ("bus: uniphier-system-bus: add UniPhier System Bus driver") > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> Arnd, Olof, Could you pick up this bug-fix for v4.6, please?
On Thu, Apr 07, 2016 at 10:59:48PM +0900, Masahiro Yamada wrote: > 2016-04-01 19:32 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko@socionext.com>: > > This patch fixes condition whether the specified address ranges > > overlap each other. > > > > Fixes: 4b7f48d395a7 ("bus: uniphier-system-bus: add UniPhier System Bus driver") > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > > --- > > Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> > > > Arnd, Olof, > > Could you pick up this bug-fix for v4.6, please? Applied to fixes. -Olof
diff --git a/drivers/bus/uniphier-system-bus.c b/drivers/bus/uniphier-system-bus.c index 834a2ae..350b730 100644 --- a/drivers/bus/uniphier-system-bus.c +++ b/drivers/bus/uniphier-system-bus.c @@ -108,7 +108,7 @@ static int uniphier_system_bus_check_overlap( for (i = 0; i < ARRAY_SIZE(priv->bank); i++) { for (j = i + 1; j < ARRAY_SIZE(priv->bank); j++) { - if (priv->bank[i].end > priv->bank[j].base || + if (priv->bank[i].end > priv->bank[j].base && priv->bank[i].base < priv->bank[j].end) { dev_err(priv->dev, "region overlap between bank%d and bank%d\n",
This patch fixes condition whether the specified address ranges overlap each other. Fixes: 4b7f48d395a7 ("bus: uniphier-system-bus: add UniPhier System Bus driver") Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- drivers/bus/uniphier-system-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)