diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 11:07:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 11:07:46 -0400 |
| commit | 0d0f3ef248e359b7363830fbd6df23897bbd1ceb (patch) | |
| tree | 6cc0ce31a3754c33443bfaf3d690074383cff7a2 /drivers/scsi/qla2xxx/qla_os.c | |
| parent | 17c0d2a1d5a562982f1f2177b8270fbfaa42508c (diff) | |
| parent | c9eeb248f3b44939532a9716bc06413383aa5d63 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] qlogicpti: fix sg list traversal error in continuation entries
[SCSI] Fix hang with split requests
[SCSI] qla2xxx: Defer enablement of RISC interrupts until ISP initialization completes.
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 26afe44265c7..6d0f0e5f2827 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -1740,6 +1740,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 1740 | if (ret) | 1740 | if (ret) |
| 1741 | goto probe_failed; | 1741 | goto probe_failed; |
| 1742 | 1742 | ||
| 1743 | ha->isp_ops->enable_intrs(ha); | ||
| 1744 | |||
| 1743 | scsi_scan_host(host); | 1745 | scsi_scan_host(host); |
| 1744 | 1746 | ||
| 1745 | qla2x00_alloc_sysfs_attr(ha); | 1747 | qla2x00_alloc_sysfs_attr(ha); |