diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-29 11:41:18 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-29 11:41:18 +0300 |
| commit | 76b36fa896a2db64582690e085f36adc76604134 (patch) | |
| tree | 78007f123ead6f96cdee6ba98ac3c289c706cc39 /drivers/base/firmware_class.c | |
| parent | 14365449b6ce34cf6a3040ff8ebbb39d89d67159 (diff) | |
| parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) | |
| download | linux-76b36fa896a2db64582690e085f36adc76604134.tar.xz | |
Merge tag 'v4.5-rc1' into x86/asm, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/base/firmware_class.c')
| -rw-r--r-- | drivers/base/firmware_class.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 8524450e75bd..b9250e564ebf 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -1118,15 +1118,17 @@ static int _request_firmware(const struct firmware **firmware_p, const char *name, struct device *device, unsigned int opt_flags) { - struct firmware *fw; + struct firmware *fw = NULL; long timeout; int ret; if (!firmware_p) return -EINVAL; - if (!name || name[0] == '\0') - return -EINVAL; + if (!name || name[0] == '\0') { + ret = -EINVAL; + goto out; + } ret = _request_firmware_prepare(&fw, name, device); if (ret <= 0) /* error or already assigned */ |