Message ID | 1455380910-30604-2-git-send-email-drjones@redhat.com |
---|---|
State | Superseded |
Headers | show |
On Sat, Feb 13, 2016 at 05:28:14PM +0100, Andrew Jones wrote: > Signed-off-by: Andrew Jones <drjones@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > > --- > Unrelated to the powerpc initial drop, but found it while working > on that, so just posting it now. Anyway, it's a trivial fix. > --- > lib/arm/io.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lib/arm/io.c b/lib/arm/io.c > index a08d394e4aa1c..a111530f4802d 100644 > --- a/lib/arm/io.c > +++ b/lib/arm/io.c > @@ -50,7 +50,8 @@ static void uart0_init(void) > } > > } else { > - assert(dt_pbus_translate_node(ret, 0, &base) == 0); > + ret = dt_pbus_translate_node(ret, 0, &base); > + assert(ret == 0); > } > > uart0_base = ioremap(base.addr, base.size);
On 13.02.2016 17:28, Andrew Jones wrote: > Signed-off-by: Andrew Jones <drjones@redhat.com> > > --- > Unrelated to the powerpc initial drop, but found it while working > on that, so just posting it now. Anyway, it's a trivial fix. > --- > lib/arm/io.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lib/arm/io.c b/lib/arm/io.c > index a08d394e4aa1c..a111530f4802d 100644 > --- a/lib/arm/io.c > +++ b/lib/arm/io.c > @@ -50,7 +50,8 @@ static void uart0_init(void) > } > > } else { > - assert(dt_pbus_translate_node(ret, 0, &base) == 0); > + ret = dt_pbus_translate_node(ret, 0, &base); > + assert(ret == 0); > } > > uart0_base = ioremap(base.addr, base.size); Reviewed-by: Thomas Huth <thuth@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/lib/arm/io.c b/lib/arm/io.c index a08d394e4aa1c..a111530f4802d 100644 --- a/lib/arm/io.c +++ b/lib/arm/io.c @@ -50,7 +50,8 @@ static void uart0_init(void) } } else { - assert(dt_pbus_translate_node(ret, 0, &base) == 0); + ret = dt_pbus_translate_node(ret, 0, &base); + assert(ret == 0); } uart0_base = ioremap(base.addr, base.size);
Signed-off-by: Andrew Jones <drjones@redhat.com> --- Unrelated to the powerpc initial drop, but found it while working on that, so just posting it now. Anyway, it's a trivial fix. --- lib/arm/io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)