From a5ec34950d7a95d8388d40d489f3fb2a2d94aa9d Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Sun, 13 Jan 2008 02:42:19 +0000 Subject: [PATCH] Allow ata_request_set_sense and ata_request_set_status to be called with NULL request pointer. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23478 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/ata/ata_request.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/ata/ata_request.c b/src/add-ons/kernel/bus_managers/ata/ata_request.c index 461fe27539..9450f9ab27 100644 --- a/src/add-ons/kernel/bus_managers/ata/ata_request.c +++ b/src/add-ons/kernel/bus_managers/ata/ata_request.c @@ -78,7 +78,7 @@ void ata_request_set_status(ata_request *request, uint8 status) { ASSERT(status != SCSI_REQ_CMP); - if (request->ccb) + if (request && request->ccb) request->ccb->subsys_status = status; } @@ -86,9 +86,11 @@ ata_request_set_status(ata_request *request, uint8 status) void ata_request_set_sense(ata_request *request, uint8 key, uint16 asc_acq) { - request->senseKey = key; - request->senseAsc = asc_acq >> 8; - request->senseAscq = asc_acq & 0xff; + if (request) { + request->senseKey = key; + request->senseAsc = asc_acq >> 8; + request->senseAscq = asc_acq & 0xff; + } }