diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-24 00:40:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-24 00:40:32 -0500 |
| commit | 4fa2b1cde0e3797549f711ce9e51c395b3d6d2a7 (patch) | |
| tree | 312e07715c088d4ed1e79b9b18b1d52e3b585ca9 /drivers/ata/libata-pmp.c | |
| parent | bdc08942897f6be33d00bb659761516f4652836d (diff) | |
| parent | 4cdfa1b3ce4731dd538ac3ed010bcf127ed6e836 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata-core: fix kernel-doc warning
sata_fsl: fix build with ATA_VERBOSE_DEBUG
[libata] ahci: AMD SB700/SB800 SATA support 64bit DMA
libata-pmp: clear hob for pmp register accesses
libata: automatically use DMADIR if drive/bridge requires it
power_state: get rid of write-only variable in SATA
pata_atiixp: Use 255 sector limit
Diffstat (limited to 'drivers/ata/libata-pmp.c')
| -rw-r--r-- | drivers/ata/libata-pmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c index caef2bbd4a8a..d91f5090ba9d 100644 --- a/drivers/ata/libata-pmp.c +++ b/drivers/ata/libata-pmp.c | |||
| @@ -35,7 +35,7 @@ static unsigned int sata_pmp_read(struct ata_link *link, int reg, u32 *r_val) | |||
| 35 | ata_tf_init(pmp_dev, &tf); | 35 | ata_tf_init(pmp_dev, &tf); |
| 36 | tf.command = ATA_CMD_PMP_READ; | 36 | tf.command = ATA_CMD_PMP_READ; |
| 37 | tf.protocol = ATA_PROT_NODATA; | 37 | tf.protocol = ATA_PROT_NODATA; |
| 38 | tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; | 38 | tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE | ATA_TFLAG_LBA48; |
| 39 | tf.feature = reg; | 39 | tf.feature = reg; |
| 40 | tf.device = link->pmp; | 40 | tf.device = link->pmp; |
| 41 | 41 | ||
| @@ -71,7 +71,7 @@ static unsigned int sata_pmp_write(struct ata_link *link, int reg, u32 val) | |||
| 71 | ata_tf_init(pmp_dev, &tf); | 71 | ata_tf_init(pmp_dev, &tf); |
| 72 | tf.command = ATA_CMD_PMP_WRITE; | 72 | tf.command = ATA_CMD_PMP_WRITE; |
| 73 | tf.protocol = ATA_PROT_NODATA; | 73 | tf.protocol = ATA_PROT_NODATA; |
| 74 | tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; | 74 | tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE | ATA_TFLAG_LBA48; |
| 75 | tf.feature = reg; | 75 | tf.feature = reg; |
| 76 | tf.device = link->pmp; | 76 | tf.device = link->pmp; |
| 77 | tf.nsect = val & 0xff; | 77 | tf.nsect = val & 0xff; |