|
@@ -1147,15 +1147,13 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap)
|
|
|
void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;
|
|
|
unsigned short int_status = ATAPI_GET_INT_STATUS(base);
|
|
|
|
|
|
- if (ATAPI_GET_STATUS(base) & (MULTI_XFER_ON|ULTRA_XFER_ON)) {
|
|
|
+ if (ATAPI_GET_STATUS(base) & (MULTI_XFER_ON|ULTRA_XFER_ON))
|
|
|
host_stat |= ATA_DMA_ACTIVE;
|
|
|
- }
|
|
|
- if (int_status & (MULTI_DONE_INT|UDMAIN_DONE_INT|UDMAOUT_DONE_INT)) {
|
|
|
+ if (int_status & (MULTI_DONE_INT|UDMAIN_DONE_INT|UDMAOUT_DONE_INT|
|
|
|
+ ATAPI_DEV_INT))
|
|
|
host_stat |= ATA_DMA_INTR;
|
|
|
- }
|
|
|
- if (int_status & (MULTI_TERM_INT|UDMAIN_TERM_INT|UDMAOUT_TERM_INT)) {
|
|
|
- host_stat |= ATA_DMA_ERR;
|
|
|
- }
|
|
|
+ if (int_status & (MULTI_TERM_INT|UDMAIN_TERM_INT|UDMAOUT_TERM_INT))
|
|
|
+ host_stat |= ATA_DMA_ERR|ATA_DMA_INTR;
|
|
|
|
|
|
dev_dbg(ap->dev, "ATAPI: host_stat=0x%x\n", host_stat);
|
|
|
|