commit 08589ac092e7db9fed1e533f7d5f713af5e9efda
author Kevin O'Connor <kevin@koconnor.net> Thu Nov 17 22:05:53 2011 -0500
committer Kevin O'Connor <kevin@koconnor.net> Thu Nov 17 22:05:53 2011 -0500
tree 56c2a20b414461a7fcd18da1a0f3b82de6b1504c
parent e1a17bbb0ee4fb11526e46f5aecf8b7ebaafdca4

usb-uhci: Be sure to wrap pipe->iobase in GET_FLATPTR().

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

src/usb-uhci.c

diff --git a/src/usb-uhci.c b/src/usb-uhci.c
index 242f3ba..a78dbca 100644
--- a/src/usb-uhci.c
+++ b/src/usb-uhci.c
@@ -248,13 +248,14 @@
             return 0;
         if (check_tsc(end)) {
             warn_timeout();
+            u16 iobase = GET_FLATPTR(pipe->iobase);
             struct uhci_td *td = (void*)(el_link & ~UHCI_PTR_BITS);
             dprintf(1, "Timeout on wait_pipe %p (td=%p s=%x c=%x/%x)\n"
                     , pipe, (void*)el_link, GET_FLATPTR(td->status)
-                    , inw(pipe->iobase + USBCMD)
-                    , inw(pipe->iobase + USBSTS));
+                    , inw(iobase + USBCMD)
+                    , inw(iobase + USBSTS));
             SET_FLATPTR(pipe->qh.element, UHCI_PTR_TERM);
-            uhci_waittick(pipe->iobase);
+            uhci_waittick(iobase);
             return -1;
         }
         yield();