From 621e8eeb9ef5cfc4ebe2985f627cf47de48315f6 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Mon, 26 Jan 2009 00:57:02 +0000 Subject: [PATCH] Fix usage of wrong port change values. The request numbers were compared with the bitmap instead of the masks. Spotted by Mika Lindqvist (after 100 reboots), thanks for tracking down such hard to spot errors! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29029 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/usb/Hub.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/usb/Hub.cpp b/src/add-ons/kernel/bus_managers/usb/Hub.cpp index 9da1929256..daefe223ac 100644 --- a/src/add-ons/kernel/bus_managers/usb/Hub.cpp +++ b/src/add-ons/kernel/bus_managers/usb/Hub.cpp @@ -153,13 +153,13 @@ Hub::ResetPort(uint8 index) if (result < B_OK) return result; - if (fPortStatus[index].change & C_PORT_RESET) { + if (fPortStatus[index].change & PORT_STATUS_RESET) { // reset is done break; } } - if ((fPortStatus[index].change & C_PORT_RESET) == 0) { + if ((fPortStatus[index].change & PORT_STATUS_RESET) == 0) { TRACE_ERROR("port %d won't reset\n", index); return B_ERROR; } @@ -302,7 +302,7 @@ Hub::Explore(change_item **changeList) 0, NULL, 0, NULL); } - if (fPortStatus[i].change & PORT_RESET) { + if (fPortStatus[i].change & PORT_STATUS_RESET) { TRACE_ALWAYS("port %ld was reset\n", i); DefaultPipe()->SendRequest(USB_REQTYPE_CLASS | USB_REQTYPE_OTHER_OUT, USB_REQUEST_CLEAR_FEATURE, C_PORT_RESET, i + 1,