diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-12 00:02:04 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-12 00:02:04 +0100 |
commit | 1cb9d721d9df9182a42d1ff59427a100c6522efc (patch) | |
tree | 3c7d47828f89853de49e979f97ffe78fd1dba7d6 /drivers/scsi/sata_sx4.c | |
parent | Merge branch 'upstream' (diff) | |
parent | [PATCH] libata: kill assert() macro (diff) | |
download | linux-1cb9d721d9df9182a42d1ff59427a100c6522efc.tar.xz linux-1cb9d721d9df9182a42d1ff59427a100c6522efc.zip |
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) unsigned int i, idx, total_len = 0, sgt_len; u32 *buf = (u32 *) &pp->dimm_buf[PDC_DIMM_HEADER_SZ]; - assert(qc->flags & ATA_QCFLAG_DMAMAP); + WARN_ON(!(qc->flags & ATA_QCFLAG_DMAMAP)); VPRINTK("ata%u: ENTER\n", ap->id); |