From e40b5c0d590247bc698a658f369ffe793b1c080e Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Fri, 26 Jan 2007 14:36:03 +0000 Subject: [PATCH] Fixed a wrong index that could cause crashes with devices containing generic descriptors git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19969 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/usb/BusManager.cpp | 2 +- src/add-ons/kernel/bus_managers/usb/Device.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/usb/BusManager.cpp b/src/add-ons/kernel/bus_managers/usb/BusManager.cpp index 2360165a2f..d439a2e2db 100644 --- a/src/add-ons/kernel/bus_managers/usb/BusManager.cpp +++ b/src/add-ons/kernel/bus_managers/usb/BusManager.cpp @@ -128,7 +128,7 @@ BusManager::AllocateDevice(Hub *parent, usb_speed speed) ControlPipe *defaultPipe = _GetDefaultPipe(speed); if (!defaultPipe) { - TRACE(("USB BusManager: error getting the default pipe for speed %d\n", (int)speed)); + TRACE_ERROR(("USB BusManager: error getting the default pipe for speed %d\n", (int)speed)); FreeAddress(deviceAddress); return NULL; } diff --git a/src/add-ons/kernel/bus_managers/usb/Device.cpp b/src/add-ons/kernel/bus_managers/usb/Device.cpp index d70ec1d09f..8b4eb2de55 100644 --- a/src/add-ons/kernel/bus_managers/usb/Device.cpp +++ b/src/add-ons/kernel/bus_managers/usb/Device.cpp @@ -191,7 +191,7 @@ Device::Device(Object *parent, usb_device_descriptor &desc, int8 deviceAddress, * sizeof(usb_descriptor *)); /* add this descriptor */ - currentInterface->generic[currentInterface->generic_count] = + currentInterface->generic[currentInterface->generic_count - 1] = (usb_descriptor *)genericDescriptor; break; }