libata-core: kill duplicate statement in ata_do_set_mode()
authorSergei Shtylyov <sshtylyov@ru.mvista.com>
Thu, 22 Dec 2011 19:41:32 +0000 (22:41 +0300)
committerJeff Garzik <jgarzik@redhat.com>
Mon, 9 Jan 2012 00:14:58 +0000 (19:14 -0500)
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>
drivers/ata/libata-core.c

index 15a3d4deb272ac94f8b55405b182223ae462af41..d5935e4f3529700f977eeea060ba4e3daac422ce 100644 (file)
@@ -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;