aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/firmware_class.c
diff options
context:
space:
mode:
authorShuah Khan <shuah.kh@samsung.com>2014-07-22 18:10:38 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-23 19:15:20 -0700
commit0542ad88fbdd81bbd53f48bff981a9867e0f0659 (patch)
tree986141359687729bc974d53147b9be1abe7bf058 /drivers/base/firmware_class.c
parentd2168146c222d607bf4baeaaaa990f39411d1567 (diff)
downloadlinux-linaro-stable-0542ad88fbdd81bbd53f48bff981a9867e0f0659.tar.gz
firmware loader: Fix _request_firmware_load() return val for fw load abort
_request_firmware_load() returns -ENOMEM when fw load is aborted after timeout. Call is_fw_load_aborted() to check if fw load is aborted and if true return -EAGAIN. Signed-off-by: Shuah Khan <shuah.kh@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/firmware_class.c')
-rw-r--r--drivers/base/firmware_class.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 124d50ceb116..da77791793f1 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -906,7 +906,9 @@ static int _request_firmware_load(struct firmware_priv *fw_priv,
wait_for_completion(&buf->completion);
cancel_delayed_work_sync(&fw_priv->timeout_work);
- if (!buf->data)
+ if (is_fw_load_aborted(buf))
+ retval = -EAGAIN;
+ else if (!buf->data)
retval = -ENOMEM;
device_remove_file(f_dev, &dev_attr_loading);