From e109130a10a696baf71eef98b3132b178c7bb9b8 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Fri, 6 Jun 2008 20:30:58 +0000 Subject: [PATCH] Fix a deadlock when removing a mass storage device that had active transfers. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25829 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp b/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp index ef749c9c80..e14e99d506 100644 --- a/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp @@ -631,9 +631,9 @@ usb_disk_device_removed(void *cookie) gLunCount -= device->lun_count; gDeviceCount--; - mutex_lock(&device->lock); device->removed = true; - mutex_unlock(&device->lock); + gUSBModule->cancel_queued_transfers(device->bulk_in); + gUSBModule->cancel_queued_transfers(device->bulk_out); if (device->open_count == 0) usb_disk_free_device_and_luns(device);