diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 21:41:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 21:41:58 -0800 |
| commit | b11d0e48aa41b644143ca526ef8d69212fdc1cdd (patch) | |
| tree | bb55e976402bc87cc8a9f5372dc947500777216b | |
| parent | 47807ce381acc34a7ffee2b42e35e96c0f322e52 (diff) | |
| parent | dfa159886f38344ede31e3b13ec614e0bebc09c6 (diff) | |
| download | op-kernel-dev-b11d0e48aa41b644143ca526ef8d69212fdc1cdd.zip op-kernel-dev-b11d0e48aa41b644143ca526ef8d69212fdc1cdd.tar.gz | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| -rw-r--r-- | drivers/scsi/libata-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 665ae79..d0a0fdb 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -2443,7 +2443,7 @@ static void ata_sg_clean(struct ata_queued_cmd *qc) struct scatterlist *psg = &qc->pad_sgent; void *addr = kmap_atomic(psg->page, KM_IRQ0); memcpy(addr + psg->offset, pad_buf, qc->pad_len); - kunmap_atomic(psg->page, KM_IRQ0); + kunmap_atomic(addr, KM_IRQ0); } } else { if (sg_dma_len(&sg[0]) > 0) @@ -2717,7 +2717,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc) if (qc->tf.flags & ATA_TFLAG_WRITE) { void *addr = kmap_atomic(psg->page, KM_IRQ0); memcpy(pad_buf, addr + psg->offset, qc->pad_len); - kunmap_atomic(psg->page, KM_IRQ0); + kunmap_atomic(addr, KM_IRQ0); } sg_dma_address(psg) = ap->pad_dma + (qc->tag * ATA_DMA_PAD_SZ); |
