summaryrefslogtreecommitdiff
path: root/drivers/scsi/sata_qstor.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-20 16:55:56 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-20 16:55:56 -0500
commitf131883e73a8662dc92c3ea371ae9ded0c8f2c37 (patch)
treeacd45903e321cf04df825da8d05ee06dabc1d8aa /drivers/scsi/sata_qstor.c
parentccbe6d5ee0eb3182675ef1c84322810fd884586d (diff)
parent2e242fa994428bd1a40b6a7e97430413246d0a16 (diff)
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/scsi/sata_qstor.c')
-rw-r--r--drivers/scsi/sata_qstor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 286482630be3..9602f43a298e 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -277,7 +277,7 @@ static unsigned int qs_fill_sg(struct ata_queued_cmd *qc)
u8 *prd = pp->pkt + QS_CPB_BYTES;
WARN_ON(qc->__sg == NULL);
- WARN_ON(qc->n_elem == 0);
+ WARN_ON(qc->n_elem == 0 && qc->pad_len == 0);
nelem = 0;
ata_for_each_sg(sg, qc) {