summaryrefslogtreecommitdiffstats
path: root/lib/test_firmware.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-09-16 08:04:28 -0400
committerIngo Molnar <mingo@kernel.org>2019-09-16 08:05:04 -0400
commit563c4f85f9f0d63b712081d5b4522152cdcb8b6b (patch)
tree92351ab2d60d5fd7ce5745d21c9a60ce6d46c5dd /lib/test_firmware.c
parent4adcdcea717cb2d8436bef00dd689aa5bc76f11b (diff)
parent09c7e8b21d67c3c78ab9701dbc0fb1e9f14a0ba5 (diff)
Merge branch 'sched/rt' into sched/core, to pick up -rt changes
Pick up the first couple of patches working towards PREEMPT_RT. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/test_firmware.c')
-rw-r--r--lib/test_firmware.c5
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)
886 return -ENOMEM; 886 return -ENOMEM;
887 887
888 rc = __test_firmware_config_init(); 888 rc = __test_firmware_config_init();
889 if (rc) 889 if (rc) {
890 kfree(test_fw_config);
891 pr_err("could not init firmware test config: %d\n", rc);
890 return rc; 892 return rc;
893 }
891 894
892 rc = misc_register(&test_fw_misc_device); 895 rc = misc_register(&test_fw_misc_device);
893 if (rc) { 896 if (rc) {