cmd640: fix kernel oops in test_irq() method
PATCH 1/1 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 <[email protected]>
---
The patch is atop of ide-2.6.git tree...
drivers/ide/cmd640.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/ide/cmd640.c +2 -4
@@ -633,12 +633,10 @@ static void __init cmd640_init_dev(ide_dstatic 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 ; }
David Miller
AppliedFrom: Sergei Shtylyov <[email protected]>
Date: Sat, 8 May 2010 22:07:14 +0400
Quoted 5 lines
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 inpci_read_config_byte().Signed-off-by Sergei Shtylyov <[email protected]>
Applied, thanks a lot Sergei.