From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson Subject: Re: [kvm-unit-tests PATCH v3 01/17] arm/arm64: trivial: another assert fix Date: Mon, 15 Feb 2016 09:55:25 +1100 Message-ID: <20160214225525.GG2732@voom.fritz.box> References: <1455380910-30604-1-git-send-email-drjones@redhat.com> <1455380910-30604-2-git-send-email-drjones@redhat.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="54ZiyWcDhi/7bWb8" Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, thuth@redhat.com, dgibson@redhat.com, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com To: Andrew Jones Return-path: Received: from ozlabs.org ([103.22.144.67]:50308 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753382AbcBOAEJ (ORCPT ); Sun, 14 Feb 2016 19:04:09 -0500 Content-Disposition: inline In-Reply-To: <1455380910-30604-2-git-send-email-drjones@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: --54ZiyWcDhi/7bWb8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Feb 13, 2016 at 05:28:14PM +0100, Andrew Jones wrote: > Signed-off-by: Andrew Jones Reviewed-by: David Gibson >=20 > --- > 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(-) >=20 > 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) > } > =20 > } else { > - assert(dt_pbus_translate_node(ret, 0, &base) =3D=3D 0); > + ret =3D dt_pbus_translate_node(ret, 0, &base); > + assert(ret =3D=3D 0); > } > =20 > uart0_base =3D ioremap(base.addr, base.size); --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --54ZiyWcDhi/7bWb8 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWwQXdAAoJEGw4ysog2bOSTA8QAOQrR7IldnL200f6OdePsSRt hxFTFkFAuAMARF+8pidyCGDtTzt9NoeAoyuefg4OJjClHXcXqV53KfO7cF1bYern ErUcCoofOQ9aihIdwBpgOQx1dMvez3Lo6CUcySfCyJbs+Xg/f3kpheu3S02AUd8C CezUI+wILyJ87EWddt2CD5NwbF6lyqOMmCxzoU806DGkXPv2NbeJKSc0i5x0KcSQ oU7w9fKTrOdshgkkQyJaoOtpeJ7qWD7FiVPrhk+DRYlFNttI/0NzJYO3BgRAc8KH 4oNGYA5sbl+EtMUmnYZqZoJt1r8oXBtSt28zHl9cLp5O6u7mVPtOrv4utsMy+RUb HQ5Cid16sXUT9spG0cDXEHl4xvw5qkdxEAmmIqArIfrlpssQDdcMrKVhZ636uPCl ZOVf1fcgL7D0PTAKX+QAcG3gWbSp9qE0w5iVmSmxspVN8a//IUR7eIc310rSx7EN bnHP/HXorjBv/qRVz2BzflTwBB0st+4O4F9gZqOwmaVSDpFACqmwW7pJ7i3aSjyp v3qtLArA5QdhHsj0lWBAvwxEGUvxyl+YTuzcIpZuYmpPVnzgYrgVrqIKGYBr5aXV bpUPFe+bZoO6FKQDP7MCBKj7KdBYbbON4OLtfPqo7/eW1FBFY41JLCFaLSrH8uAF FzSbshVoi+faeZihysDS =ZRTR -----END PGP SIGNATURE----- --54ZiyWcDhi/7bWb8--