diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 18:02:04 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 18:02:04 -0500 |
commit | 1cb9d721d9df9182a42d1ff59427a100c6522efc (patch) | |
tree | 3c7d47828f89853de49e979f97ffe78fd1dba7d6 /drivers/scsi/sata_sx4.c | |
parent | ca7d5e42d783e54f0057317c9226262d68ab7717 (diff) | |
parent | bef4a456b8dc8b3638f4d49a25a89e1467da9483 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_sx4.c')
-rw-r--r-- | drivers/scsi/sata_sx4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c index b7cf279deeb2..04465fb86e1d 100644 --- a/drivers/scsi/sata_sx4.c +++ b/drivers/scsi/sata_sx4.c | |||
@@ -461,7 +461,7 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc) | |||
461 | unsigned int i, idx, total_len = 0, sgt_len; | 461 | unsigned int i, idx, total_len = 0, sgt_len; |
462 | u32 *buf = (u32 *) &pp->dimm_buf[PDC_DIMM_HEADER_SZ]; | 462 | u32 *buf = (u32 *) &pp->dimm_buf[PDC_DIMM_HEADER_SZ]; |
463 | 463 | ||
464 | assert(qc->flags & ATA_QCFLAG_DMAMAP); | 464 | WARN_ON(!(qc->flags & ATA_QCFLAG_DMAMAP)); |
465 | 465 | ||
466 | VPRINTK("ata%u: ENTER\n", ap->id); | 466 | VPRINTK("ata%u: ENTER\n", ap->id); |
467 | 467 | ||