summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorVikram Mulukutla <markivx@codeaurora.org>2015-05-14 13:58:06 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:07:40 -0700
commit08c8dcb464e9df999963d60b07f007c4d1e33ee7 (patch)
tree669c162ca0b4f94553ad685bacda993955d54845 /drivers/base
parent3e47c536248f28324a416015a91fa8b226e4c7d0 (diff)
firmware_class: Don't fail request_firmware if we're not using a buffer
A check that the intermediate firmware actually contains data is performed before returning from request_firmware. Perform this check only if we're actually using the intermediate buffer. Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/firmware_class.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index f9f5d6e53b65..0052affdca31 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -1113,7 +1113,7 @@ static int _request_firmware_load(struct firmware_priv *fw_priv,
if (is_fw_load_aborted(buf))
retval = -EAGAIN;
- else if (!buf->data)
+ else if (!buf->data && buf->is_paged_buf)
retval = -ENOMEM;
device_del(f_dev);