i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi_cd: reset io_scheduler and dma_resource on uninit.

Browse Source 
it seems possible that a file descriptor is still opened after the device
is uninited. at least handle properly the situation.
help with #15089

Change-Id: I76fb41a8439ab7350ce4d781511aceb6496847c3
Reviewed-on: https://review.haiku-os.org/c/1486
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Jérôme Duval
2019-05-27 16:42:20 +00:00
committed by waddlesplash
parent ff4af513e1
commit 061236d419
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp
+8
View File
@@ -709,6 +709,8 @@ cd_uninit_device(void* _cookie)
delete info->io_scheduler; delete info->io_scheduler;
delete info->dma_resource; delete info->dma_resource;
info->io_scheduler = NULL;
info->dma_resource = NULL;
} }
@@ -772,6 +774,9 @@ cd_read(void* cookie, off_t pos, void* buffer, size_t* _length)
if (status != B_OK) if (status != B_OK)
return status; return status;
if (handle->info->io_scheduler == NULL)
return B_DEV_NO_MEDIA;
status = handle->info->io_scheduler->ScheduleRequest(&request); status = handle->info->io_scheduler->ScheduleRequest(&request);
if (status != B_OK) if (status != B_OK)
return status; return status;
@@ -800,6 +805,9 @@ cd_write(void* cookie, off_t pos, const void* buffer, size_t* _length)
if (status != B_OK) if (status != B_OK)
return status; return status;
if (handle->info->io_scheduler == NULL)
return B_DEV_NO_MEDIA;
status = handle->info->io_scheduler->ScheduleRequest(&request); status = handle->info->io_scheduler->ScheduleRequest(&request);
if (status != B_OK) if (status != B_OK)
return status; return status;