From b097a651efb4e907d8579a79c87db796c2b2f065 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Tue, 11 May 2010 00:08:03 -0700 Subject: [PATCH] --- yaml --- r: 198211 b: refs/heads/master c: a9ddabc52ce3757a4331d6c1e8bf4065333cc51b h: refs/heads/master i: 198209: fd9585dc4898487680717c74e10c21de725bae61 198207: 8996e928b519fc285b4a0af84240dc8f97143e0d v: v3 --- [refs] | 2 +- trunk/drivers/ide/cmd640.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b5ba24d34ef2..c0ef15ddc7d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f693be4d8a00431b53a59d74aefdb3f7ae92f662 +refs/heads/master: a9ddabc52ce3757a4331d6c1e8bf4065333cc51b diff --git a/trunk/drivers/ide/cmd640.c b/trunk/drivers/ide/cmd640.c index d2b8b272bc27..cb10201a15ed 100644 --- a/trunk/drivers/ide/cmd640.c +++ b/trunk/drivers/ide/cmd640.c @@ -633,12 +633,10 @@ static void __init cmd640_init_dev(ide_drive_t *drive) static int cmd640_test_irq(ide_hwif_t *hwif) { - struct pci_dev *dev = to_pci_dev(hwif->dev); int irq_reg = hwif->channel ? ARTTIM23 : CFR; - u8 irq_stat, irq_mask = hwif->channel ? ARTTIM23_IDE23INTR : + u8 irq_mask = hwif->channel ? ARTTIM23_IDE23INTR : CFR_IDE01INTR; - - pci_read_config_byte(dev, irq_reg, &irq_stat); + u8 irq_stat = get_cmd640_reg(irq_reg); return (irq_stat & irq_mask) ? 1 : 0; }