ipmi: fix timeout calculation when bmc is disconnected

[pandora-kernel.git] / drivers / block / cpqarray.c

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index b2fceb5..504bc16 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);
 
@@ -1195,6 +1195,7 @@ out_passthru:
                ida_pci_info_struct pciinfo;
 
                if (!arg) return -EINVAL;
+               memset(&pciinfo, 0, sizeof(pciinfo));
                pciinfo.bus = host->pci_dev->bus->number;
                pciinfo.dev_fn = host->pci_dev->devfn;
                pciinfo.board_id = host->board_id;