From ddb73d9f4606b0a1f8d1efaf3d34069184d553d6 Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Fri, 11 Jan 2008 01:33:10 +0000 Subject: [PATCH] fix bugs exposed by ASSERT git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23377 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/ata/ata_request.c | 6 +++--- 1 file changed, 3 insertions(+), 3 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 b0d412ae1b..2801e9645f 100644 --- a/src/add-ons/kernel/bus_managers/ata/ata_request.c +++ b/src/add-ons/kernel/bus_managers/ata/ata_request.c @@ -120,9 +120,9 @@ ata_request_finish(ata_request *request, bool resubmit) // we cannot copy sense directly as sense buffer may be too small scsi_set_sense(&sense, request); - ASSERT(sizeof(*request->ccb->sense) == SCSI_MAX_SENSE_SIZE); + ASSERT(sizeof(request->ccb->sense) == SCSI_MAX_SENSE_SIZE); - sense_len = min(sizeof(*request->ccb->sense), sizeof(sense)); + sense_len = min(sizeof(request->ccb->sense), sizeof(sense)); memcpy(request->ccb->sense, &sense, sense_len); request->ccb->sense_resid = SCSI_MAX_SENSE_SIZE - sense_len; @@ -131,7 +131,7 @@ ata_request_finish(ata_request *request, bool resubmit) // device sense gets reset once it's read ata_request_clear_sense(request); - ASSERT(request->ccb->subsys_status == SCSI_REQ_CMP_ERR); + ASSERT(request->ccb->subsys_status == SCSI_REQ_CMP_ERR | SCSI_AUTOSNS_VALID); ASSERT(request->ccb->device_status == SCSI_STATUS_CHECK_CONDITION); } }