Auto merge with /home/aegl/GIT/linus

[linux-2.6-omap-h63xx.git] / drivers / message / fusion / mptfc.c

diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index 91c79e525d3ca909ec49fdebb73399ad4a5d431c..d8d65397e06e668be27cebf001e6681ddfd253c4 100644 (file)
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -134,6 +134,10 @@ static struct pci_device_id mptfc_pci_table[] = {
                PCI_ANY_ID, PCI_ANY_ID },
        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC929X,
                PCI_ANY_ID, PCI_ANY_ID },
+       { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC939X,
+               PCI_ANY_ID, PCI_ANY_ID },
+       { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949X,
+               PCI_ANY_ID, PCI_ANY_ID },
        {0}     /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(pci, mptfc_pci_table);
@@ -166,6 +170,9 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                return r;
        
        ioc = pci_get_drvdata(pdev);
+       ioc->DoneCtx = mptfcDoneCtx;
+       ioc->TaskCtx = mptfcTaskCtx;
+       ioc->InternalCtx = mptfcInternalCtx;
 
        /*  Added sanity check on readiness of the MPT adapter.
         */
@@ -325,10 +332,6 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        hd->timer.data = (unsigned long) hd;
        hd->timer.function = mptscsih_timer_expired;
 
-       ioc->DoneCtx = mptfcDoneCtx;
-       ioc->TaskCtx = mptfcTaskCtx;
-       ioc->InternalCtx = mptfcInternalCtx;
-
        hd->mpt_pq_filter = mpt_pq_filter;
 
        ddvprintk((MYIOC_s_INFO_FMT