diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
commit | 18ee3610040a4c008ce08a40a5dd025241cc7e97 (patch) | |
tree | 32a996a5123726b63c31a1522f230933fb967a32 /drivers/message/fusion/mptspi.c | |
parent | e4e7b89280d1d666e2c09e5ad36cf071796c4c7e (diff) | |
parent | b4103333d7904310d34de18d85e51e3d74f00a3b (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/message/fusion/mptspi.c')
-rw-r--r-- | drivers/message/fusion/mptspi.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index 7dce29277cb7..f148dfa39117 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c | |||
@@ -384,6 +384,14 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
384 | goto out_mptspi_probe; | 384 | goto out_mptspi_probe; |
385 | } | 385 | } |
386 | 386 | ||
387 | /* | ||
388 | * issue internal bus reset | ||
389 | */ | ||
390 | if (ioc->spi_data.bus_reset) | ||
391 | mptscsih_TMHandler(hd, | ||
392 | MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS, | ||
393 | 0, 0, 0, 0, 5); | ||
394 | |||
387 | scsi_scan_host(sh); | 395 | scsi_scan_host(sh); |
388 | return 0; | 396 | return 0; |
389 | 397 | ||
@@ -445,7 +453,7 @@ static void __exit | |||
445 | mptspi_exit(void) | 453 | mptspi_exit(void) |
446 | { | 454 | { |
447 | pci_unregister_driver(&mptspi_driver); | 455 | pci_unregister_driver(&mptspi_driver); |
448 | 456 | ||
449 | mpt_reset_deregister(mptspiDoneCtx); | 457 | mpt_reset_deregister(mptspiDoneCtx); |
450 | dprintk((KERN_INFO MYNAM | 458 | dprintk((KERN_INFO MYNAM |
451 | ": Deregistered for IOC reset notifications\n")); | 459 | ": Deregistered for IOC reset notifications\n")); |