From 60a650ff81cc658029b4ebf4ad0783b934896720 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 25 Sep 2017 08:28:54 +0200 Subject: [PATCH] fix up s390 build error for 3.18 --- ...g-trace-records-for-early-returns-in-tmf-eh-handlers.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/queue-3.18/scsi-zfcp-fix-missing-trace-records-for-early-returns-in-tmf-eh-handlers.patch b/queue-3.18/scsi-zfcp-fix-missing-trace-records-for-early-returns-in-tmf-eh-handlers.patch index de978b17110..c8efd169a15 100644 --- a/queue-3.18/scsi-zfcp-fix-missing-trace-records-for-early-returns-in-tmf-eh-handlers.patch +++ b/queue-3.18/scsi-zfcp-fix-missing-trace-records-for-early-returns-in-tmf-eh-handlers.patch @@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman ret = fc_block_scsi_eh(scpnt); - if (ret) + if (ret) { -+ zfcp_dbf_scsi_devreset("fiof", scpnt, tm_flags, NULL); ++ zfcp_dbf_scsi_devreset("fiof", scpnt, tm_flags); return ret; + } @@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman } - if (!fsf_req) + if (!fsf_req) { -+ zfcp_dbf_scsi_devreset("reqf", scpnt, tm_flags, NULL); ++ zfcp_dbf_scsi_devreset("reqf", scpnt, tm_flags); return FAILED; + } -- 2.47.3