From 887be5801abef3b2d914bc58c70b2f608d47d22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 27 Oct 2008 16:00:43 +0000 Subject: [PATCH] * Don't try to update the DMAResource in case there is no medium (also saves a panic when ejecting a disc, since updating DMAResource isn't implemented yet...). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28348 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp b/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp index 89ecf73553..eca2ebacd5 100644 --- a/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp +++ b/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp @@ -863,6 +863,12 @@ cd_set_capacity(cd_driver_info* info, uint64 capacity, uint32 blockSize) info->capacity = capacity; if (info->block_size != blockSize) { + if (capacity == 0) { + // there is obviously no medium in the drive, don't try to update + // the DMA resource + return; + } + if (info->block_size != 0) { dprintf("old %ld, new %ld\n", info->block_size, blockSize); panic("updating DMAResource not yet implemented...");