diff --git a/[refs] b/[refs]
index a06996f35d2c..bfed1f63c796 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95fdd5e980e6eea4579c15043f7a9be6ad63012c
+refs/heads/master: db95fc004ea50f661a98c9f25585c0a734b5c238
diff --git a/trunk/drivers/scsi/libfc/fc_lport.c b/trunk/drivers/scsi/libfc/fc_lport.c
index ca278d4b0f66..d385d1147889 100644
--- a/trunk/drivers/scsi/libfc/fc_lport.c
+++ b/trunk/drivers/scsi/libfc/fc_lport.c
@@ -980,7 +980,8 @@ static void fc_lport_recv_req(struct fc_lport *lport,
 	rcu_read_unlock();
 	FC_LPORT_DBG(lport, "dropping unexpected frame type %x\n", fh->fh_type);
 	fc_frame_free(fp);
-	lport->tt.exch_done(sp);
+	if (sp)
+		lport->tt.exch_done(sp);
 }
 
 /**