Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit a9ddabc52ce3757a4331d6c1e8bf4065333cc51b

Authored by Sergei Shtylyov
Committed by David S. Miller
1 parent f693be4d8a
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 2 additions and 4 deletions Side-by-side Diff

drivers/ide/cmd640.c
Diff comments   View file @ a9ddabc
... ... @@ -633,12 +633,10 @@
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 }