Commit 3c8359d1 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

omap_dss: correct chip[1] index in RFBI_READ/RFBI_STATUS 



The RFBI_READ/RFBI_STATUS code incorrectly uses chip[0] when it should
be using chip[1].  Andrzej Zaborowski <balrog@zabor.org> confirmed this
bug since I don't know this code well.

Reported-by: default avatarDr David Alan Gilbert <davidagilbert@uk.ibm.com>
Reviewed-by: default avatarAndrzej Zaborowski <andrew.zaborowski@intel.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
parent cee8e6ad

hw/omap_dss.c

+2 −2
Original line number Diff line number Diff line
@@ -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;