From ec5cc81fa0d9f5c717d6c8758a9abb2f39cfbf8a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 14 Jun 2011 12:46:40 +0000 Subject: [PATCH] exit_debugger(): * Only try to cancel the a transfer, if sUseUSBKeyboard is set. * Set the "_usbPipe" parameter. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42181 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/debugger/usb_keyboard/usb_keyboard.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/debugger/usb_keyboard/usb_keyboard.cpp b/src/add-ons/kernel/debugger/usb_keyboard/usb_keyboard.cpp index 581b6dfb13..6161250c92 100644 --- a/src/add-ons/kernel/debugger/usb_keyboard/usb_keyboard.cpp +++ b/src/add-ons/kernel/debugger/usb_keyboard/usb_keyboard.cpp @@ -176,10 +176,13 @@ enter_debugger(void) static void exit_debugger(void) { - // make sure a possibly pending transfer is canceled - evaluate_debug_command("uhci_process_transfer cancel"); + if (sUseUSBKeyboard) { + // make sure a possibly pending transfer is canceled + set_debug_variable("_usbPipe", (uint64)sUSBPipe); + evaluate_debug_command("uhci_process_transfer cancel"); - sUseUSBKeyboard = false; + sUseUSBKeyboard = false; + } }