diff options
| author |   James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-02-05 14:06:27 +0900 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2008-02-06 06:59:32 -0500 |
| commit | 37198e3051b63d3184886e9bb8235e7578e82628 (patch) | |
| tree | 3ecd4e8b6b7c710b808909adbd2bf643a10e85b0 /drivers/ata/sata_fsl.c | |
| parent | ahci: fix CAP.NP and PI handling (diff) | |
| download | linux-dev-37198e3051b63d3184886e9bb8235e7578e82628.tar.xz linux-dev-37198e3051b63d3184886e9bb8235e7578e82628.zip | |
libata: kill now unused n_iter and fix sata_fsl
qc->n_iter was used for libata's own sg walking before sg chaining
replaced it. During conversion, the field and its usage in sata_fsl
were left behind. Kill the filed and update sata_fsl.
tj: This was part of James's libata-use-block-layer-padding patch.
Separated out by me.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Li Yang <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/sata_fsl.c')
| -rw-r--r-- | drivers/ata/sata_fsl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 922d7b2efba8..efcb66b6ccef 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c @@ -355,8 +355,8 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc, ata_port_printk(qc->ap, KERN_ERR, "s/g len unaligned : 0x%x\n", sg_len); - if ((num_prde == (SATA_FSL_MAX_PRD_DIRECT - 1)) && - (qc->n_iter + 1 != qc->n_elem)) { + if (num_prde == (SATA_FSL_MAX_PRD_DIRECT - 1) && + sg_next(sg) != NULL) { VPRINTK("setting indirect prde\n"); prd_ptr_to_indirect_ext = prd; prd->dba = cpu_to_le32(indirect_ext_segment_paddr); |