From ce12bcbd64a615aed57fd459944b9c5f16462090 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 18 Jan 2010 07:18:38 +0000 Subject: [PATCH] --- yaml --- r: 185783 b: refs/heads/master c: 22cabc2619a58d3e5f95bb8df823da535e103bf4 h: refs/heads/master i: 185781: 0dbe38e9d3705218e97adbc0c5cedacd0a3f0de0 185779: 315d93098688566859f03f2cd97d2085dd92b215 185775: 47cabdd825df59e569e0d35834a6f82349bc501d v: v3 --- [refs] | 2 +- trunk/drivers/ide/cmd64x.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0a734e6e7333..9b6bf2716358 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60349ab99f2742a6f04da86724740498c7b1f885 +refs/heads/master: 22cabc2619a58d3e5f95bb8df823da535e103bf4 diff --git a/trunk/drivers/ide/cmd64x.c b/trunk/drivers/ide/cmd64x.c index 5c5dd90d032b..9f89f3116df0 100644 --- a/trunk/drivers/ide/cmd64x.c +++ b/trunk/drivers/ide/cmd64x.c @@ -146,10 +146,8 @@ static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed) u8 unit = drive->dn & 0x01; u8 regU = 0, pciU = hwif->channel ? UDIDETCR1 : UDIDETCR0; - if (speed >= XFER_SW_DMA_0) { - (void) pci_read_config_byte(dev, pciU, ®U); - regU &= ~(unit ? 0xCA : 0x35); - } + pci_read_config_byte(dev, pciU, ®U); + regU &= ~(unit ? 0xCA : 0x35); switch(speed) { case XFER_UDMA_5: @@ -177,8 +175,7 @@ static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed) break; } - if (speed >= XFER_SW_DMA_0) - (void) pci_write_config_byte(dev, pciU, regU); + pci_write_config_byte(dev, pciU, regU); } static void cmd648_clear_irq(ide_drive_t *drive)