---

yaml --- r: 198211 b: refs/heads/master c: a9ddabc h: refs/heads/master i: 198209: fd9585d 198207: 8996e92 v: v3
git-mirror · May 11, 2010 · b097a65 · b097a65
1 parent 1acdc86
commit b097a65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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;
 }