1 files changed, 13 insertions, 11 deletions

diff --git a/firmware/target/arm/pp/ata-pp5020.c b/firmware/target/arm/pp/ata-pp5020.c
index 176e74993c..7351215693 100644
--- a/firmware/target/arm/pp/ata-pp5020.c
+++ b/firmware/target/arm/pp/ata-pp5020.c
@@ -48,8 +48,8 @@ bool ata_is_coldstart()
    rest are the same. They go in IDE0_PRI_TIMING0.
 
    Rockbox used to use 0x10, and test_disk shows that leads to faster PIO.
-   However on some disks connected with mSATA adapters this causes corrupt data
-   so we now just use these timings from the OF.
+   However when used with mSATA and some SD adapters this causes corrupt data
+   so we now unconditionally use these timings from the OF.
 */
 static const unsigned long pio80mhz[] = {
     0xC293, 0x43A2, 0x11A1, 0x7232, 0x3131
@@ -83,10 +83,7 @@ void ata_device_init()
 /* Setup the timing for PIO mode */
 void ata_set_pio_timings(int mode)
 {
-    if (ata_disk_isssd())
-        IDE0_PRI_TIMING0 = pio80mhz[mode];
-    else
-        IDE0_PRI_TIMING0 = 0x10;
+    IDE0_PRI_TIMING0 = pio80mhz[mode];
 }
 
 #ifdef HAVE_ATA_DMA
@@ -109,6 +106,8 @@ static bool dma_boosted = false;
 static bool dma_needs_boost;
 #endif
 
+static int ata_is_ssd = 0;
+
 /* This function sets up registers for 80 Mhz.
    Ultra DMA mode 2 works at 30 Mhz.
  */
@@ -136,6 +135,8 @@ void ata_dma_set_mode(unsigned char mode) {
 #if !defined(IPOD_NANO)
     IDE0_CFG |= 0x20000000; /* >= 50 Mhz */
 #endif
+
+    ata_is_ssd = ata_disk_isssd();
 }
 
 #define IDE_CFG_INTRQ           8
@@ -175,11 +176,12 @@ bool ata_dma_setup(void *addr, unsigned long bytes, bool write) {
     /* Writes only need to be word-aligned, but by default DMA
      * is not used for writing on non-SSDs as it appears to be slower.
      */
-    if (!ata_disk_isssd())
-        return false;
-
-    if (write && ((unsigned long)addr & 3))
-        return false;
+    if (write) {
+        if ((unsigned long)addr & 3)
+            return false;
+        if (!ata_is_ssd)
+            return false;
+    }
 
 #if ATA_MAX_UDMA > 2
     if (dma_needs_boost && !dma_boosted) {