| commit | f131883e73a8662dc92c3ea371ae9ded0c8f2c37 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jgarzik@pobox.com> | Mon Feb 20 16:55:56 2006 -0500 |
| committer | Jeff Garzik <jgarzik@pobox.com> | Mon Feb 20 16:55:56 2006 -0500 |
| tree | acd45903e321cf04df825da8d05ee06dabc1d8aa | |
| parent | ccbe6d5ee0eb3182675ef1c84322810fd884586d [diff] [blame] | |
| parent | 2e242fa994428bd1a40b6a7e97430413246d0a16 [diff] [blame] |
Merge branch 'upstream-fixes'
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c index 2864826..9602f43 100644 --- a/drivers/scsi/sata_qstor.c +++ b/drivers/scsi/sata_qstor.c
@@ -277,7 +277,7 @@ 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) {