From 23ebd1bd2faf48d31236654e60628652a93d33e7 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Tue, 31 Mar 2009 20:15:27 +0200 Subject: [PATCH] --- yaml --- r: 139441 b: refs/heads/master c: c4199930b119eb9c1ffb102ed57eaac4d4424d08 h: refs/heads/master i: 139439: 8a90afcd53ed047ce6f5b856c595b96df3886493 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-iops.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eee46ffa4a06..e37b4185b427 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d64fcd9357798ad0d61f8877de13d5e1b1ab510 +refs/heads/master: c4199930b119eb9c1ffb102ed57eaac4d4424d08 diff --git a/trunk/drivers/ide/ide-iops.c b/trunk/drivers/ide/ide-iops.c index 5403e4a44be4..0e62698146b6 100644 --- a/trunk/drivers/ide/ide-iops.c +++ b/trunk/drivers/ide/ide-iops.c @@ -386,9 +386,11 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) return error; } - id[ATA_ID_UDMA_MODES] &= ~0xFF00; - id[ATA_ID_MWDMA_MODES] &= ~0x0F00; - id[ATA_ID_SWDMA_MODES] &= ~0x0F00; + if (speed >= XFER_SW_DMA_0) { + id[ATA_ID_UDMA_MODES] &= ~0xFF00; + id[ATA_ID_MWDMA_MODES] &= ~0x0700; + id[ATA_ID_SWDMA_MODES] &= ~0x0700; + } skip: #ifdef CONFIG_BLK_DEV_IDEDMA