1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 221875ec3d7c..f607314810ac 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -155,6 +155,7 @@ static struct fc_fcp_pkt *fc_fcp_pkt_alloc(struct fc_lport *lport, gfp_t gfp)
                 fsp->xfer_ddp = FC_XID_UNKNOWN;
                 atomic_set(&fsp->ref_cnt, 1);
                 init_timer(&fsp->timer);
+                fsp->timer.data = (unsigned long)fsp;
                 INIT_LIST_HEAD(&fsp->list);
                 spin_lock_init(&fsp->scsi_pkt_lock);
         }
@@ -1850,9 +1851,6 @@ int fc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc_cmd)
         }
         put_cpu();
 
-        init_timer(&fsp->timer);
-        fsp->timer.data = (unsigned long)fsp;
-
         /*
          * send it to the lower layer
          * if we get -1 return then put the request in the pending