git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-fixes'
[sfrench/cifs-2.6.git]
/
drivers
/
scsi
/
sata_qstor.c
diff --git
a/drivers/scsi/sata_qstor.c
b/drivers/scsi/sata_qstor.c
index 286482630be30c7411cc4c4596e6eec591c4d3a2..9602f43a298e1a2c7290e461ff00d7f6dcf479ef 100644
(file)
--- 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) {