From 4e0437e93575d21985b321cd99a05673f1fc47b0 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Tue, 13 Nov 2007 22:09:14 +0100 Subject: [PATCH] --- yaml --- r: 73647 b: refs/heads/master c: 6183289cd4356b790c5eaa619020fb887ec0fa44 h: refs/heads/master i: 73645: fe5ae98baeb6962eccf2c4eddc953ed0891030a3 73643: 276174b1169382fad2bfeb3ff9ea8058745cc038 73639: 6b58dfb8e5b7eb929af4f0cd37c6ea1cee1a30a9 73631: 8539a33eab1004d7fa9785268b61e35b48aa527f v: v3 --- [refs] | 2 +- trunk/drivers/ide/pci/cmd64x.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5bbe1cbd213b..1dac871b728d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9418d5dc9ba40b88737580457bf3b7c63c60ec43 +refs/heads/master: 6183289cd4356b790c5eaa619020fb887ec0fa44 diff --git a/trunk/drivers/ide/pci/cmd64x.c b/trunk/drivers/ide/pci/cmd64x.c index ea0143ef5fe5..51fca441c294 100644 --- a/trunk/drivers/ide/pci/cmd64x.c +++ b/trunk/drivers/ide/pci/cmd64x.c @@ -1,5 +1,5 @@ /* - * linux/drivers/ide/pci/cmd64x.c Version 1.50 May 10, 2007 + * linux/drivers/ide/pci/cmd64x.c Version 1.51 Nov 8, 2007 * * cmd64x.c: Enable interrupts at initialization time on Ultra/PCI machines. * Due to massive hardware bugs, UltraDMA is only supported @@ -339,7 +339,8 @@ static int cmd648_ide_dma_end (ide_drive_t *drive) u8 mrdmode = inb(hwif->dma_master + 0x01); /* clear the interrupt bit */ - outb(mrdmode | irq_mask, hwif->dma_master + 0x01); + outb((mrdmode & ~(MRDMODE_INTR_CH0 | MRDMODE_INTR_CH1)) | irq_mask, + hwif->dma_master + 0x01); return err; }