---

yaml
---
r: 287923
b: refs/heads/master
c: c7a9927
h: refs/heads/master
i:
  287921: b59a8a9
  287919: 2888524
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67ddda353c4e26ba23a199ae64fdf283b669469b
+refs/heads/master: c7a992784240c1b16425c6a9606c9db0fc28fb0c

trunk/drivers/scsi/qla2xxx/qla_os.c

@@ -1131,7 +1131,6 @@ static int
 qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
 {
 	scsi_qla_host_t *vha = shost_priv(cmd->device->host);
-	fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
 	struct qla_hw_data *ha = vha->hw;
 	int ret = FAILED;
 	unsigned int id, lun;
@@ -1140,15 +1139,6 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
 	id = cmd->device->id;
 	lun = cmd->device->lun;
 
-	if (!fcport) {
-		return ret;
-	}
-
-	ret = fc_block_scsi_eh(cmd);
-	if (ret != 0)
-		return ret;
-	ret = FAILED;
-
 	ql_log(ql_log_info, vha, 0x8018,
 	    "ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun);