diff options
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 68f5d24b938b..b78919a318e2 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -62,7 +62,7 @@ MODULE_PARM_DESC(ql2xallocfwdump, | |||
62 | "vary by ISP type. Default is 1 - allocate memory."); | 62 | "vary by ISP type. Default is 1 - allocate memory."); |
63 | 63 | ||
64 | int ql2xextended_error_logging; | 64 | int ql2xextended_error_logging; |
65 | module_param(ql2xextended_error_logging, int, S_IRUGO|S_IRUSR); | 65 | module_param(ql2xextended_error_logging, int, S_IRUGO|S_IWUSR); |
66 | MODULE_PARM_DESC(ql2xextended_error_logging, | 66 | MODULE_PARM_DESC(ql2xextended_error_logging, |
67 | "Option to enable extended error logging, " | 67 | "Option to enable extended error logging, " |
68 | "Default is 0 - no logging. 1 - log errors."); | 68 | "Default is 0 - no logging. 1 - log errors."); |
@@ -157,6 +157,8 @@ static struct scsi_host_template qla24xx_driver_template = { | |||
157 | 157 | ||
158 | .slave_alloc = qla2xxx_slave_alloc, | 158 | .slave_alloc = qla2xxx_slave_alloc, |
159 | .slave_destroy = qla2xxx_slave_destroy, | 159 | .slave_destroy = qla2xxx_slave_destroy, |
160 | .scan_finished = qla2xxx_scan_finished, | ||
161 | .scan_start = qla2xxx_scan_start, | ||
160 | .change_queue_depth = qla2x00_change_queue_depth, | 162 | .change_queue_depth = qla2x00_change_queue_depth, |
161 | .change_queue_type = qla2x00_change_queue_type, | 163 | .change_queue_type = qla2x00_change_queue_type, |
162 | .this_id = -1, | 164 | .this_id = -1, |
@@ -1705,6 +1707,7 @@ qla2x00_remove_one(struct pci_dev *pdev) | |||
1705 | 1707 | ||
1706 | scsi_host_put(ha->host); | 1708 | scsi_host_put(ha->host); |
1707 | 1709 | ||
1710 | pci_disable_device(pdev); | ||
1708 | pci_set_drvdata(pdev, NULL); | 1711 | pci_set_drvdata(pdev, NULL); |
1709 | } | 1712 | } |
1710 | 1713 | ||
@@ -1747,8 +1750,6 @@ qla2x00_free_device(scsi_qla_host_t *ha) | |||
1747 | if (ha->iobase) | 1750 | if (ha->iobase) |
1748 | iounmap(ha->iobase); | 1751 | iounmap(ha->iobase); |
1749 | pci_release_regions(ha->pdev); | 1752 | pci_release_regions(ha->pdev); |
1750 | |||
1751 | pci_disable_device(ha->pdev); | ||
1752 | } | 1753 | } |
1753 | 1754 | ||
1754 | static inline void | 1755 | static inline void |