From: Steve Wise <swise@opengridcomputing.com>
Date: Tue, 29 Apr 2014 01:48:43 +0000 (-0500)
Subject: cxgb4: fixed regression bug in fw load patch.
X-Git-Tag: vofed-3.12~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=72c4dc6d19f8f5c41395a8efc462039ee55e94df;p=~emulex%2Fcompat-rdma_3.12.git

cxgb4: fixed regression bug in fw load patch.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
---

diff --git a/linux-next-pending/0022-cxgb4-Adds-embedded-FW-support-for-T4-T5.patch b/linux-next-pending/0022-cxgb4-Adds-embedded-FW-support-for-T4-T5.patch
index a089153..86f9116 100644
--- a/linux-next-pending/0022-cxgb4-Adds-embedded-FW-support-for-T4-T5.patch
+++ b/linux-next-pending/0022-cxgb4-Adds-embedded-FW-support-for-T4-T5.patch
@@ -63,7 +63,7 @@ index 6b90eae..13152b5 100644
  		ret = request_firmware(&fw, fw_info->fw_mod_name,
  				       adap->pdev_dev);
 -		if (ret < 0) {
-+		ret = t4_request_firmware(&bfw, adap->params.chip);
++		rc = t4_request_firmware(&bfw, adap->params.chip);
 +		if (ret < 0 && rc < 0) {
  			dev_err(adap->pdev_dev,
  				"unable to load firmware image %s, error %d\n",