2 files changed, 3 insertions, 1 deletions

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 71663fb77310..ee0c1df8a6d2 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -495,7 +495,7 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)
         fc_host_supported_classes(shost) = FC_COS_CLASS2 | FC_COS_CLASS3;
 
         adapter->hydra_version = bottom->adapter_type;
-        adapter->timer_ticks = bottom->timer_interval;
+        adapter->timer_ticks = bottom->timer_interval & ZFCP_FSF_TIMER_INT_MASK;
         adapter->stat_read_buf_num = max(bottom->status_read_buf_num,
                                          (u16)FSF_STATUS_READS_RECOM);
 
diff --git a/drivers/s390/scsi/zfcp_fsf.h b/drivers/s390/scsi/zfcp_fsf.h
index 519083fd6e89..ca45e32d6b6f 100644
--- a/drivers/s390/scsi/zfcp_fsf.h
+++ b/drivers/s390/scsi/zfcp_fsf.h
@@ -352,6 +352,8 @@ struct fsf_qtcb_bottom_support {
         u8  els[256];
 } __attribute__ ((packed));
 
+#define ZFCP_FSF_TIMER_INT_MASK 0x3FFF
+
 struct fsf_qtcb_bottom_config {
         u32 lic_version;
         u32 feature_selection;