From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 24 Feb 2012 17:02:01 +0000 (-0600)
Subject: qla2xxx: handle default case in qla2x00_request_firmware()
X-Git-Tag: v2.6.39-400.9.0~474
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ce9206bc5306e2fd84a305a3e47bd10cbbf722d4;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: handle default case in qla2x00_request_firmware()

This silences a static checker warning.  Also we're always adding new types of
firmware, so it might fix a bug in real life some day.

JIRA Key: V2632FC-177
---

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 2916444e90be..5f82996fbcd5 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -4073,7 +4073,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)) {
@@ -4094,6 +4093,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);