|
@@ -238,6 +238,7 @@ static int qla2xxx_eh_host_reset(struct scsi_cmnd *);
|
|
|
|
|
|
static int qla2x00_change_queue_depth(struct scsi_device *, int, int);
|
|
|
static int qla2x00_change_queue_type(struct scsi_device *, int);
|
|
|
+static void qla2x00_clear_drv_active(struct qla_hw_data *);
|
|
|
static void qla2x00_free_device(scsi_qla_host_t *);
|
|
|
|
|
|
struct scsi_host_template qla2xxx_driver_template = {
|
|
@@ -2954,16 +2955,8 @@ probe_failed:
|
|
|
scsi_host_put(base_vha->host);
|
|
|
|
|
|
probe_hw_failed:
|
|
|
- if (IS_QLA82XX(ha)) {
|
|
|
- qla82xx_idc_lock(ha);
|
|
|
- qla82xx_clear_drv_active(ha);
|
|
|
- qla82xx_idc_unlock(ha);
|
|
|
- }
|
|
|
- if (IS_QLA8044(ha)) {
|
|
|
- qla8044_idc_lock(ha);
|
|
|
- qla8044_clear_drv_active(ha);
|
|
|
- qla8044_idc_unlock(ha);
|
|
|
- }
|
|
|
+ qla2x00_clear_drv_active(ha);
|
|
|
+
|
|
|
iospace_config_failed:
|
|
|
if (IS_P3P_TYPE(ha)) {
|
|
|
if (!ha->nx_pcibase)
|