Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / s390 / scsi / zfcp_fc.c

diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index 6f3ed2b9a34948edc4a6c709236b78e1e155fb37..86fd905df48b29041a1cc4ac3268aa56b2489430 100644 (file)
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -365,7 +365,7 @@ void zfcp_fc_port_did_lookup(struct work_struct *work)
        }
 
        if (!port->d_id) {
-               zfcp_erp_port_failed(port, "fcgpn_2", NULL);
+               zfcp_erp_set_port_status(port, ZFCP_STATUS_COMMON_ERP_FAILED);
                goto out;
        }