X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fdrivers%2Fnet%2Fethernet%2Fchelsio%2Fcxgb3%2Fcxgb3_main.c;fp=kernel%2Fdrivers%2Fnet%2Fethernet%2Fchelsio%2Fcxgb3%2Fcxgb3_main.c;h=8f7aa53a4c4bec39040dc88fbf7640a3ea6a2389;hb=e09b41010ba33a20a87472ee821fa407a5b8da36;hp=b96e4bfcac41a8086d5fbb45bf508bd5175072ee;hpb=f93b97fd65072de626c074dbe099a1fff05ce060;p=kvmfornfv.git diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/kernel/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index b96e4bfca..8f7aa53a4 100644 --- a/kernel/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/kernel/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -1025,19 +1025,19 @@ int t3_get_edc_fw(struct cphy *phy, int edc_idx, int size) { struct adapter *adapter = phy->adapter; const struct firmware *fw; - char buf[64]; + const char *fw_name; u32 csum; const __be32 *p; u16 *cache = phy->phy_cache; - int i, ret; - - snprintf(buf, sizeof(buf), get_edc_fw_name(edc_idx)); + int i, ret = -EINVAL; - ret = request_firmware(&fw, buf, &adapter->pdev->dev); + fw_name = get_edc_fw_name(edc_idx); + if (fw_name) + ret = request_firmware(&fw, fw_name, &adapter->pdev->dev); if (ret < 0) { dev_err(&adapter->pdev->dev, "could not upgrade firmware: unable to load %s\n", - buf); + fw_name); return ret; }