aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptspi.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/mptspi.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/mptspi.c')
-rw-r--r--drivers/message/fusion/mptspi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index a4e3c96524e7..5f9a61b85b3b 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -180,6 +180,9 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
180 return r; 180 return r;
181 181
182 ioc = pci_get_drvdata(pdev); 182 ioc = pci_get_drvdata(pdev);
183 ioc->DoneCtx = mptspiDoneCtx;
184 ioc->TaskCtx = mptspiTaskCtx;
185 ioc->InternalCtx = mptspiInternalCtx;
183 186
184 /* Added sanity check on readiness of the MPT adapter. 187 /* Added sanity check on readiness of the MPT adapter.
185 */ 188 */
@@ -395,10 +398,6 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
395 hd->scandv_wait_done = 0; 398 hd->scandv_wait_done = 0;
396 hd->last_queue_full = 0; 399 hd->last_queue_full = 0;
397 400
398 ioc->DoneCtx = mptspiDoneCtx;
399 ioc->TaskCtx = mptspiTaskCtx;
400 ioc->InternalCtx = mptspiInternalCtx;
401
402 error = scsi_add_host (sh, &ioc->pcidev->dev); 401 error = scsi_add_host (sh, &ioc->pcidev->dev);
403 if(error) { 402 if(error) {
404 dprintk((KERN_ERR MYNAM 403 dprintk((KERN_ERR MYNAM