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>

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index f9f5d6e..0052aff 100644 (file)
--- 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);