diff options
| author | Sergei Shtylyov | 2011-12-22 20:41:32 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2012-01-09 01:14:58 +0100 |
| commit | 80a9c430007b489823bc1b5300f4a1ba39ca1ef9 (patch) | |
| tree | 3e64070cd2ea995d59fcb5593d5542aafe0682e7 /drivers/ata/libata-core.c | |
| parent | pata_of_platform: remove direct dependency on OF_IRQ (diff) | |
| download | kernel-qcow2-linux-80a9c430007b489823bc1b5300f4a1ba39ca1ef9.tar.gz kernel-qcow2-linux-80a9c430007b489823bc1b5300f4a1ba39ca1ef9.tar.xz kernel-qcow2-linux-80a9c430007b489823bc1b5300f4a1ba39ca1ef9.zip | |
libata-core: kill duplicate statement in ata_do_set_mode()
Commit b3a706014e56b1356e7b275fd25b833c63175bf0 (libata: Add a
drivers/ide style DMA disable) neglected to remove the line in
ata_do_set_mode() it has obviously made useless/duplicated. Do this
now, and make a line added back then wrapped properly...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 15a3d4deb272..d5935e4f3529 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -3249,10 +3249,10 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev) ata_force_xfermask(dev); pio_mask = ata_pack_xfermask(dev->pio_mask, 0, 0); - dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask); if (libata_dma_mask & mode_mask) - dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask); + dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, + dev->udma_mask); else dma_mask = 0; |