From 7e1493304682289e923d39f4461b2ae14f3aec40 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Thu, 22 Dec 2011 22:41:32 +0300 Subject: [PATCH] --- yaml --- r: 282118 b: refs/heads/master c: 80a9c430007b489823bc1b5300f4a1ba39ca1ef9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3dfcf9d43f08..85b04b92468c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0643aa16688131b4dfbd03797ad73bab4ff29bf +refs/heads/master: 80a9c430007b489823bc1b5300f4a1ba39ca1ef9 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 15a3d4deb272..d5935e4f3529 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/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;