aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptfc.c
diff options
context:
space:
mode:
authorMoore, Eric Dean <Eric.Moore@lsil.com>2005-04-30 18:09:38 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-05-20 13:53:42 -0400
commitd335cc38c75e28407455463444b912b09c92daec (patch)
tree031810afee4004df4797a641d9d02fe3955a3b9b /drivers/message/fusion/mptfc.c
parent4e33bd874bce8b3df2ab52538db59730196383c3 (diff)
[SCSI] mptfusion: fix panic loading driver statically compiled
Adjust link ordering in the Makefile. Also, the ioc->DoneCtx handles for mptspi/mptfc in the message frame. And I'm now not seeing the panic. Signed-off-by: Eric Moore <Eric.Moore@lsil.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/fusion/mptfc.c')
-rw-r--r--drivers/message/fusion/mptfc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index 91c79e525d3c..11845faeede5 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -166,6 +166,9 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
166 return r; 166 return r;
167 167
168 ioc = pci_get_drvdata(pdev); 168 ioc = pci_get_drvdata(pdev);
169 ioc->DoneCtx = mptfcDoneCtx;
170 ioc->TaskCtx = mptfcTaskCtx;
171 ioc->InternalCtx = mptfcInternalCtx;
169 172
170 /* Added sanity check on readiness of the MPT adapter. 173 /* Added sanity check on readiness of the MPT adapter.
171 */ 174 */
@@ -325,10 +328,6 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
325 hd->timer.data = (unsigned long) hd; 328 hd->timer.data = (unsigned long) hd;
326 hd->timer.function = mptscsih_timer_expired; 329 hd->timer.function = mptscsih_timer_expired;
327 330
328 ioc->DoneCtx = mptfcDoneCtx;
329 ioc->TaskCtx = mptfcTaskCtx;
330 ioc->InternalCtx = mptfcInternalCtx;
331
332 hd->mpt_pq_filter = mpt_pq_filter; 331 hd->mpt_pq_filter = mpt_pq_filter;
333 332
334 ddvprintk((MYIOC_s_INFO_FMT 333 ddvprintk((MYIOC_s_INFO_FMT