From patchwork Fri Feb 19 15:58:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 585259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 265B1140775 for ; Sat, 20 Feb 2016 02:58:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1428018AbcBSP6i (ORCPT ); Fri, 19 Feb 2016 10:58:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56756 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423265AbcBSP6h (ORCPT ); Fri, 19 Feb 2016 10:58:37 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 827D618B250; Fri, 19 Feb 2016 15:58:37 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-251.brq.redhat.com [10.34.1.251]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1JFwWkA002316; Fri, 19 Feb 2016 10:58:35 -0500 From: Andrew Jones To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com, rkrcmar@redhat.com Subject: [kvm-unit-tests PATCH v6 01/18] arm/arm64: trivial: another assert fix Date: Fri, 19 Feb 2016 16:58:06 +0100 Message-Id: <1455897503-11835-2-git-send-email-drjones@redhat.com> In-Reply-To: <1455897503-11835-1-git-send-email-drjones@redhat.com> References: <1455897503-11835-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Signed-off-by: Andrew Jones Reviewed-by: David Gibson Reviewed-by: Thomas Huth --- 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);