From: Swen Schillig <swen@xxxxxxxxxxxx> In case of an adapter reopen all rports have to be deleted from the environment. This should only happen for already registered rports otherwise fc_remote_port_delete is called with a NULL pointer. Signed-off-by: Swen Schillig <swen@xxxxxxxxxxxx> Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx> --- drivers/s390/scsi/zfcp_erp.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/s390/scsi/zfcp_erp.c 2008-09-30 13:52:06.000000000 +0200 +++ b/drivers/s390/scsi/zfcp_erp.c 2008-09-30 13:52:22.000000000 +0200 @@ -1236,6 +1236,8 @@ static void zfcp_erp_rports_del(struct z { struct zfcp_port *port; list_for_each_entry(port, &adapter->port_list_head, list) { + if (!port->rport) + continue; fc_remote_port_delete(port->rport); port->rport = NULL; } -- -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html