diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2010-05-11 00:08:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-11 00:08:03 -0700 |
| commit | a9ddabc52ce3757a4331d6c1e8bf4065333cc51b (patch) | |
| tree | 3ed67e857fe0b729aed9b466ea5827e9c8e0114a | |
| parent | f693be4d8a00431b53a59d74aefdb3f7ae92f662 (diff) | |
| download | linux-a9ddabc52ce3757a4331d6c1e8bf4065333cc51b.tar.gz linux-a9ddabc52ce3757a4331d6c1e8bf4065333cc51b.tar.bz2 linux-a9ddabc52ce3757a4331d6c1e8bf4065333cc51b.zip | |
cmd640: fix kernel oops in test_irq() method
When implementing the test_iqr() method, I forgot that this driver is not an
ordinary PCI driver and also needs to support VLB variant of the chip. Moreover,
'hwif->dev' should be NULL, potentially causing oops in pci_read_config_byte().
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/ide/cmd640.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c index d2b8b272bc27..cb10201a15ed 100644 --- a/drivers/ide/cmd640.c +++ b/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; } |