diff --git a/src/add-ons/kernel/bus_managers/scsi/dma_buffer.cpp b/src/add-ons/kernel/bus_managers/scsi/dma_buffer.cpp
index b652a25cf8..340067f4f0 100644
--- a/src/add-ons/kernel/bus_managers/scsi/dma_buffer.cpp
+++ b/src/add-ons/kernel/bus_managers/scsi/dma_buffer.cpp
@@ -465,6 +465,7 @@ scsi_release_dma_buffer(scsi_ccb *request)
 	release_sem(device->dma_buffer_owner);
 
 	request->buffered = false;
+	request->dma_buffer = NULL;
 }
 
 
diff --git a/src/add-ons/kernel/bus_managers/scsi/scatter_gather.cpp b/src/add-ons/kernel/bus_managers/scsi/scatter_gather.cpp
index 2869fc2156..4397def85a 100644
--- a/src/add-ons/kernel/bus_managers/scsi/scatter_gather.cpp
+++ b/src/add-ons/kernel/bus_managers/scsi/scatter_gather.cpp
@@ -156,7 +156,7 @@ cleanup_tmp_sg(scsi_ccb *ccb)
 		ccb, ccb->data, ccb->data_length);
 
 	res = unlock_memory(ccb->data, ccb->data_length, B_DMA_IO
-		|  ((ccb->flags & SCSI_DIR_MASK) == SCSI_DIR_IN ? B_READ_DEVICE : 0));
+		| ((ccb->flags & SCSI_DIR_MASK) == SCSI_DIR_IN ? B_READ_DEVICE : 0));
 
 	if (res != B_OK) {
 		SHOW_FLOW0(3, "Cannot unlock previously locked memory!");