diff --git a/[refs] b/[refs]
index 0ac40219828c..decce9133cf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2e977ca364764dabb091c360f329868b7e3f29b
+refs/heads/master: 286fc8f8ea7ef58b54f150fc900ce019af483e89
diff --git a/trunk/drivers/scsi/lpfc/lpfc_init.c b/trunk/drivers/scsi/lpfc/lpfc_init.c
index 71d2c8d3b001..a2e15436730e 100644
--- a/trunk/drivers/scsi/lpfc/lpfc_init.c
+++ b/trunk/drivers/scsi/lpfc/lpfc_init.c
@@ -948,10 +948,12 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp)
 					"10-port ", "PCIe"};
 			break;
 		default:
+			m = (typeof(m)){ 0 };
 			break;
 		}
 		break;
 	default:
+		m = (typeof(m)){ 0 };
 		break;
 	}
 
diff --git a/trunk/drivers/scsi/lpfc/lpfc_scsi.h b/trunk/drivers/scsi/lpfc/lpfc_scsi.h
index acd64c49e849..cdcd2535803f 100644
--- a/trunk/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/trunk/drivers/scsi/lpfc/lpfc_scsi.h
@@ -23,10 +23,13 @@
 struct lpfc_hba;
 
 #define list_remove_head(list, entry, type, member)		\
+	do {							\
+	entry = NULL;						\
 	if (!list_empty(list)) {				\
 		entry = list_entry((list)->next, type, member);	\
 		list_del_init(&entry->member);			\
-	}
+	}							\
+	} while(0)
 
 #define list_get_first(list, type, member)			\
 	(list_empty(list)) ? NULL :				\