Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[~andy/linux] / drivers / block / cpqarray.c

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index b2fceb53e8092bd28355f7678ea4e92351952299..9125bbeacd4dcc6fa49043b7fe795b1c1c78b013 100644 (file)
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -620,6 +620,7 @@ static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
        }
        vendor_id = pdev->vendor;
        device_id = pdev->device;
+       revision  = pdev->revision;
        irq = pdev->irq;
 
        for(i=0; i<6; i++)
@@ -632,7 +633,6 @@ static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
        }
 
        pci_read_config_word(pdev, PCI_COMMAND, &command);
-       pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
        pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &cache_line_size);
        pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency_timer);