summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_qstor.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-12 00:02:04 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-02-12 00:02:04 +0100
commit1cb9d721d9df9182a42d1ff59427a100c6522efc (patch)
tree3c7d47828f89853de49e979f97ffe78fd1dba7d6 /drivers/scsi/sata_qstor.c
parentMerge branch 'upstream' (diff)
parent[PATCH] libata: kill assert() macro (diff)
downloadlinux-1cb9d721d9df9182a42d1ff59427a100c6522efc.tar.xz
linux-1cb9d721d9df9182a42d1ff59427a100c6522efc.zip
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_qstor.c')
-rw-r--r--drivers/scsi/sata_qstor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index d5c912763d0c..5730167d2e74 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -277,8 +277,8 @@ static unsigned int qs_fill_sg(struct ata_queued_cmd *qc)
unsigned int nelem;
u8 *prd = pp->pkt + QS_CPB_BYTES;
- assert(qc->__sg != NULL);
- assert(qc->n_elem > 0);
+ WARN_ON(qc->__sg == NULL);
+ WARN_ON(qc->n_elem == 0);
nelem = 0;
ata_for_each_sg(sg, qc) {