diff options
| author |   sonic zhang <sonic.adi@gmail.com> | 2007-11-26 17:50:56 +0800 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-11-26 11:03:40 -0500 |
| commit | dc86f6d4183c79a08fa01c08dd2191895c0c7eb0 (patch) | |
| tree | 75aaf265edb509b6c7c6685254a17fe5222905f2 /drivers/ata | |
| parent | pata_ali: trim trailing whitespace (fix checkpatch complaints) (diff) | |
| download | linux-dev-dc86f6d4183c79a08fa01c08dd2191895c0c7eb0.tar.xz linux-dev-dc86f6d4183c79a08fa01c08dd2191895c0c7eb0.zip | |
libata: Return proper ATA INT status in pata_bf54x driver
INT status can be OR.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_bf54x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c index b5e38426b815..81db405a5445 100644 --- a/drivers/ata/pata_bf54x.c +++ b/drivers/ata/pata_bf54x.c @@ -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; |