summaryrefslogtreecommitdiff
path: root/drivers/scsi/sata_qstor.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-20 16:56:08 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-20 16:56:08 -0500
commit11fff8287fdaeb700df79aa8253650b60c7b21e2 (patch)
treea0b695f44810b4cf8c4b3f81dd25811a10871003 /drivers/scsi/sata_qstor.c
parenta5fd79ccd60b7c9cc0221dfaaa950933eff6af99 (diff)
parentf131883e73a8662dc92c3ea371ae9ded0c8f2c37 (diff)
Merge branch 'upstream'
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 bfc1dc8e7779..bf7bb9ec18d0 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) {