Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
authored by Sergei Shtylyov and committed by David S. Miller a9ddabc5 f693be4d
+2
-4
drivers/ide/cmd640.c
+2
-4
drivers/ide/cmd640.c
···
633
633
634
634
static int cmd640_test_irq(ide_hwif_t *hwif)
635
635
{
636
-
struct pci_dev *dev = to_pci_dev(hwif->dev);
637
636
int irq_reg = hwif->channel ? ARTTIM23 : CFR;
638
-
u8 irq_stat, irq_mask = hwif->channel ? ARTTIM23_IDE23INTR :
637
+
u8 irq_mask = hwif->channel ? ARTTIM23_IDE23INTR :
639
638
CFR_IDE01INTR;
640
-
641
-
pci_read_config_byte(dev, irq_reg, &irq_stat);
639
+
u8 irq_stat = get_cmd640_reg(irq_reg);
642
640
643
641
return (irq_stat & irq_mask) ? 1 : 0;
644
642
}