]> pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
libata: Return proper ATA INT status in pata_bf54x driver
authorsonic zhang <sonic.adi@gmail.com>
Mon, 26 Nov 2007 09:50:56 +0000 (17:50 +0800)
committerJeff Garzik <jeff@garzik.org>
Mon, 26 Nov 2007 16:03:40 +0000 (11:03 -0500)
INT status can be OR.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/ata/pata_bf54x.c

index b5e38426b815ec4ed64854d467ee0548f1a90c8b..81db405a5445bfe1a685cb374d406c4ac97de672 100644 (file)
@@ -1145,13 +1145,13 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap)
        unsigned short int_status = ATAPI_GET_INT_STATUS(base);
 
        if (ATAPI_GET_STATUS(base) & (MULTI_XFER_ON|ULTRA_XFER_ON)) {
-               host_stat = ATA_DMA_ACTIVE;
+               host_stat |= ATA_DMA_ACTIVE;
        }
        if (int_status & (MULTI_DONE_INT|UDMAIN_DONE_INT|UDMAOUT_DONE_INT)) {
-               host_stat = ATA_DMA_INTR;
+               host_stat |= ATA_DMA_INTR;
        }
        if (int_status & (MULTI_TERM_INT|UDMAIN_TERM_INT|UDMAOUT_TERM_INT)) {
-               host_stat = ATA_DMA_ERR;
+               host_stat |= ATA_DMA_ERR;
        }
 
        return host_stat;