Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index 83ea6c4e623c..6ca97a63b3d6 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -886,8 +886,11 @@ static int __init test_firmware_init(void)
                 return -ENOMEM;
 
         rc = __test_firmware_config_init();
-        if (rc)
+        if (rc) {
+                kfree(test_fw_config);
+                pr_err("could not init firmware test config: %d\n", rc);
                 return rc;
+        }
 
         rc = misc_register(&test_fw_misc_device);
         if (rc) {