From 08c8dcb464e9df999963d60b07f007c4d1e33ee7 Mon Sep 17 00:00:00 2001 From: Vikram Mulukutla Date: Thu, 14 May 2015 13:58:06 -0700 Subject: [PATCH] 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 --- drivers/base/firmware_class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);