From 037710d21d66bcf01589ae7b22aed5a8fc43153c Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 21 Feb 2012 10:29:40 +0300
Subject: [PATCH] --- yaml --- r: 293037 b: refs/heads/master c:
 8a6552299e2c3b01bb49ea52be2788f7c6bd8bf2 h: refs/heads/master i:   293035:
 3a6b9b489716512211c330771ccd43a2f0d5729f v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_os.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5fc6adc389d9..4ffd0977634a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13de2c541993394ec4db4949302312a0ce0af7b1
+refs/heads/master: 8a6552299e2c3b01bb49ea52be2788f7c6bd8bf2
diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c
index 094af74989d6..a2f999273a5f 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_os.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_os.c
@@ -4058,7 +4058,6 @@ qla2x00_request_firmware(scsi_qla_host_t *vha)
 	struct qla_hw_data *ha = vha->hw;
 	struct fw_blob *blob;
 
-	blob = NULL;
 	if (IS_QLA2100(ha)) {
 		blob = &qla_fw_blobs[FW_ISP21XX];
 	} else if (IS_QLA2200(ha)) {
@@ -4079,6 +4078,8 @@ qla2x00_request_firmware(scsi_qla_host_t *vha)
 		blob = &qla_fw_blobs[FW_ISP2031];
 	} else if (IS_QLA8031(ha)) {
 		blob = &qla_fw_blobs[FW_ISP8031];
+	} else {
+		return NULL;
 	}
 
 	mutex_lock(&qla_fw_lock);