From 08589ac092e7db9fed1e533f7d5f713af5e9efda Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 17 Nov 2011 22:05:53 -0500 Subject: [PATCH] usb-uhci: Be sure to wrap pipe->iobase in GET_FLATPTR(). Signed-off-by: Kevin O'Connor --- src/usb-uhci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 @@ wait_pipe(struct uhci_pipe *pipe, int timeout) 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(); -- 2.25.1