1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index 12ed62ce9ff7..2a07692007bd 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -137,8 +137,10 @@ iser_prepare_write_cmd(struct iscsi_task *task,
 
         if (unsol_sz < edtl) {
                 hdr->flags     |= ISER_WSV;
-                hdr->write_stag = cpu_to_be32(mem_reg->rkey);
-                hdr->write_va   = cpu_to_be64(mem_reg->sge.addr + unsol_sz);
+                if (buf_out->data_len > imm_sz) {
+                        hdr->write_stag = cpu_to_be32(mem_reg->rkey);
+                        hdr->write_va = cpu_to_be64(mem_reg->sge.addr + unsol_sz);
+                }
 
                 iser_dbg("Cmd itt:%d, WRITE tags, RKEY:%#.4X "
                          "VA:%#llX + unsol:%d\n",