Patchwork libata-core: kill duplicate statement in ata_do_set_mode()

login
register
mail settings
Submitter Sergei Shtylyov
Date Dec. 22, 2011, 7:41 p.m.
Message ID <201112222241.32287.sshtylyov@ru.mvista.com>
Download mbox | patch
Permalink /patch/132879/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Sergei Shtylyov - Dec. 22, 2011, 7:41 p.m.
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>

---
This patch is against the recent Linus' tree.

 drivers/ata/libata-core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: linux-2.6/drivers/ata/libata-core.c
===================================================================
--- linux-2.6.orig/drivers/ata/libata-core.c
+++ linux-2.6/drivers/ata/libata-core.c
@@ -3248,10 +3248,10 @@  int ata_do_set_mode(struct ata_link *lin
 		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;