From: Sergei Shtylyov Date: Thu, 22 Dec 2011 19:41:32 +0000 (+0300) Subject: libata-core: kill duplicate statement in ata_do_set_mode() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=80a9c430007b489823bc1b5300f4a1ba39ca1ef9;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 15a3d4deb27..d5935e4f352 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;