1 files changed, 11 insertions, 3 deletions

diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index b5e38426b815..7842cc487359 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;
@@ -1489,6 +1489,8 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)
         int board_idx = 0;
         struct resource *res;
         struct ata_host *host;
+        unsigned int fsclk = get_sclk();
+        int udma_mode = 5;
         const struct ata_port_info *ppi[] =
                 { &bfin_port_info[board_idx], NULL };
 
@@ -1507,6 +1509,12 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)
         if (res == NULL)
                 return -EINVAL;
 
+        while (bfin_port_info[board_idx].udma_mask > 0 &&
+                        udma_fsclk[udma_mode] > fsclk) {
+                udma_mode--;
+                bfin_port_info[board_idx].udma_mask >>= 1;
+        }
+
         /*
          * Now that that's out of the way, wire up the port..
          */