commit 674b632df847753aaa974fff42f3e74f78043930
author Björn Stenberg <bjorn@haxx.se> Mon Apr 28 12:02:14 2003 +0000
committer Björn Stenberg <bjorn@haxx.se> Mon Apr 28 12:02:14 2003 +0000
tree 06bdf3a04c4613f639a8f2a681211ad4ba432f6f
parent 9d5eab3d9f5d5f9e0cef38c3837b80df67c195ec

Corrected wrong write return code.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3623 a1c6a512-1295-4272-9138-f99709370657

firmware/drivers/ata.c

diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index 92332b5..ec99bf7 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -196,7 +196,6 @@
 
     timeout = current_tick + READ_TIMEOUT;
 
- retry:
     ATA_SELECT = ata_device;
     if (!wait_for_rdy())
     {
@@ -205,6 +204,7 @@
         return -2;
     }
 
+ retry:
     buf = inbuf;
     count = incount;
     while (TIME_BEFORE(current_tick, timeout)) {
@@ -363,10 +363,9 @@
 
     for (i=0; i<count; i++) {
         int j;
-        if (!wait_for_start_of_transfer())
-        {
-            mutex_unlock(&ata_mtx);
-            return 0;
+        if (!wait_for_start_of_transfer()) {
+            ret = -3;
+            break;
         }
 
         if (spinup) {
@@ -391,8 +390,8 @@
         last_disk_activity = current_tick;
     }
 
-    if(!wait_for_end_of_transfer())
-        ret = -3;
+    if(!ret && !wait_for_end_of_transfer())
+        ret = -4;
 
     led(false);