cxgb4: Inform caller if driver didn't upgrade firmware

[pandora-kernel.git] / drivers / net / ethernet / chelsio / cxgb4 / cxgb4_main.c

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index b9cd08d..a3f866d 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -933,7 +933,13 @@ static int upgrade_fw(struct adapter *adap)
                if (!ret)
                        dev_info(dev, "firmware upgraded to version %pI4 from "
                                 FW_FNAME "\n", &hdr->fw_ver);
+       } else {
+               /*
+                * Tell our caller that we didn't upgrade the firmware.
+                */
+               ret = -EINVAL;
        }
+
 out:   release_firmware(fw);
        return ret;
 }