<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23686">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libpayload/drivers/usb/uhci: Fix regression<br><br>Commit e9738dbe "Make USB transfer functions return amount of bytes"<br>introduced a regression on all UHCI controllers.<br><br>Instead of returning the amount of bytes processed, it returned zero on<br>success.<br><br>Fixes infinite usb_poll loop on Lenovo T500 using UHCI controller.<br><br>Change-Id: I823521e24f6f9e04c86d36fda751c449cd884ce3<br>Signed-off-by: Patrick Rudolph <siro@das-labor.org><br>---<br>M payloads/libpayload/drivers/usb/uhci.c<br>1 file changed, 2 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/23686/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/libpayload/drivers/usb/uhci.c b/payloads/libpayload/drivers/usb/uhci.c</span><br><span>index cdba3de..c2a0beb 100644</span><br><span>--- a/payloads/libpayload/drivers/usb/uhci.c</span><br><span>+++ b/payloads/libpayload/drivers/usb/uhci.c</span><br><span>@@ -315,6 +315,7 @@</span><br><span>     int count = (2 + (dalen + mlen - 1) / mlen);</span><br><span>         unsigned short req = ((unsigned short *) devreq)[0];</span><br><span>         int i;</span><br><span style="color: hsl(120, 100%, 40%);">+        int result = dalen;</span><br><span>  td_t *tds = memalign (16, sizeof (td_t) * count);</span><br><span>    memset (tds, 0, sizeof (td_t) * count);</span><br><span>      count--;                /* to compensate for 0-indexed array */</span><br><span>@@ -367,10 +368,7 @@</span><br><span>       td_t *td = wait_for_completed_qh (dev->controller,</span><br><span>                                          UHCI_INST (dev->controller)-></span><br><span>                                          qh_data);</span><br><span style="color: hsl(0, 100%, 40%);">-     int result;</span><br><span style="color: hsl(0, 100%, 40%);">-     if (td == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-          result = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-     } else {</span><br><span style="color: hsl(120, 100%, 40%);">+      if (td) {</span><br><span>            usb_debug ("control packet, req %x\n", req);</span><br><span>               td_dump (td);</span><br><span>                result = -1;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23686">change 23686</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23686"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I823521e24f6f9e04c86d36fda751c449cd884ce3 </div>
<div style="display:none"> Gerrit-Change-Number: 23686 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <siro@das-labor.org> </div>