Commit 80a9c430 authored Dec 22, 2011 by Sergei Shtylyov Committed by Jeff Garzik Jan 08, 2012

libata-core: kill duplicate statement in ata_do_set_mode()



Commit b3a70601 (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>

parent d0643aa1

drivers/ata/libata-core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;