From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 14:56:03 +0000 (+0200)
Subject: Correct *actual counting in OHCI
X-Git-Tag: 1.99~654^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24582ab39b8353f4acae89f2a377f3f8eca60977;p=thirdparty%2Fgrub.git

Correct *actual counting in OHCI
---

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index aa96ed5e6..39e47ffee 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -989,6 +989,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
         transfer->last_trans = tderr_virt->tr_index;
       else
         transfer->last_trans = -1;
+      *actual = transfer->size;
     }
 
   else if (err_halt) /* error, ED is halted by OHCI, i.e. can be modified */
@@ -1178,8 +1179,6 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       else
         transfer->last_trans = -1;
     }
-  else
-    *actual = transfer->size;
 
   /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
   ed_virt->td_head = grub_cpu_to_le32 (grub_le_to_cpu32 (ed_virt->td_tail) & ~0xf);