From patchwork Wed Sep 30 17:44:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 34616 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C858BB7BBC for ; Thu, 1 Oct 2009 05:46:51 +1000 (EST) Received: from localhost ([127.0.0.1]:56016 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mt58S-000872-7K for incoming@patchwork.ozlabs.org; Wed, 30 Sep 2009 15:46:48 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mt3Ff-0005fw-UM for qemu-devel@nongnu.org; Wed, 30 Sep 2009 13:46:07 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mt3Fb-0005aJ-3P for qemu-devel@nongnu.org; Wed, 30 Sep 2009 13:46:07 -0400 Received: from [199.232.76.173] (port=44806 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mt3Fa-0005aB-V8 for qemu-devel@nongnu.org; Wed, 30 Sep 2009 13:46:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61367) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mt3Fa-0006TL-5M for qemu-devel@nongnu.org; Wed, 30 Sep 2009 13:46:02 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8UHjw3u028367; Wed, 30 Sep 2009 13:45:58 -0400 Received: from redhat.com (dhcp-0-94.tlv.redhat.com [10.35.0.94]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8UHjt4a024652; Wed, 30 Sep 2009 13:45:56 -0400 Date: Wed, 30 Sep 2009 19:44:03 +0200 From: "Michael S. Tsirkin" To: Blue Swirl Message-ID: <20090930174403.GF1399@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 05/13] omap_dma: fix unbalanced { in commented out code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix unbalanced {} in commented out code. Signed-off-by: Michael S. Tsirkin --- hw/omap_dma.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/omap_dma.c b/hw/omap_dma.c index 6f5eaca..205d010 100644 --- a/hw/omap_dma.c +++ b/hw/omap_dma.c @@ -588,7 +588,7 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma) #ifdef MULTI_REQ /* TODO: should all of this only be done if dma->update, and otherwise * inside omap_dma_transfer_generic below - check what's faster. */ - if (dma->update) { + if (dma->update) #endif /* If the channel is element synchronized, deactivate it */ @@ -668,7 +668,9 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma) /* TODO: if the destination port is IMIF or EMIFF, set the dirty * bits on it. */ +#ifndef MULTI_REQ } +#endif omap_dma_interrupts_update(s); }