From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjUxu-0002og-UQ for qemu-devel@nongnu.org; Sat, 07 Jan 2012 07:01:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RjUxt-0002lm-RU for qemu-devel@nongnu.org; Sat, 07 Jan 2012 07:01:38 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:52117) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjUxt-0002lP-Fn for qemu-devel@nongnu.org; Sat, 07 Jan 2012 07:01:37 -0500 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 7 Jan 2012 12:01:33 -0000 From: Stefan Hajnoczi Date: Sat, 7 Jan 2012 11:59:59 +0000 Message-Id: <1325937599-12763-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] omap_dss: correct chip[1] index in RFBI_READ/RFBI_STATUS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Andrzej Zaborowski , Dr David Alan Gilbert , Stefan Hajnoczi The RFBI_READ/RFBI_STATUS code incorrectly uses chip[0] when it should be using chip[1]. Andrzej Zaborowski confirmed this bug since I don't know this code well. Reported-by: Dr David Alan Gilbert Signed-off-by: Stefan Hajnoczi --- hw/omap_dss.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/omap_dss.c b/hw/omap_dss.c index ede640b..86ed6ea 100644 --- a/hw/omap_dss.c +++ b/hw/omap_dss.c @@ -793,7 +793,7 @@ static void omap_rfbi_write(void *opaque, target_phys_addr_t addr, if ((s->rfbi.control & (1 << 2)) && s->rfbi.chip[0]) s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 1); else if ((s->rfbi.control & (1 << 3)) && s->rfbi.chip[1]) - s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 1); + s->rfbi.rxbuf = s->rfbi.chip[1]->read(s->rfbi.chip[1]->opaque, 1); if (!-- s->rfbi.pixels) omap_rfbi_transfer_stop(s); break; @@ -802,7 +802,7 @@ static void omap_rfbi_write(void *opaque, target_phys_addr_t addr, if ((s->rfbi.control & (1 << 2)) && s->rfbi.chip[0]) s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 0); else if ((s->rfbi.control & (1 << 3)) && s->rfbi.chip[1]) - s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 0); + s->rfbi.rxbuf = s->rfbi.chip[1]->read(s->rfbi.chip[1]->opaque, 0); if (!-- s->rfbi.pixels) omap_rfbi_transfer_stop(s); break; -- 1.7.7.3