lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firmware: Ignore abort check when no user-helper is used

Browse Source 
FW_STATUS_ABORT can be set only during the user-helper invocation,
thus we can ignore the check when CONFIG_HW_LOADER_USER_HELPER is
disabled.

Acked-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Takashi Iwai
2013-01-31 11:13:57 +01:00
committed by Greg Kroah-Hartman
parent cd7239fab7
commit 807be03cae
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/base/firmware_class.c
View File

@@ -454,6 +454,9 @@ static void fw_load_abort(struct firmware_priv *fw_priv)
complete_all(&buf->completion); complete_all(&buf->completion);
} }
#define is_fw_load_aborted(buf) \
test_bit(FW_STATUS_ABORT, &(buf)->status)
static ssize_t firmware_timeout_show(struct class *class, static ssize_t firmware_timeout_show(struct class *class,
struct class_attribute *attr, struct class_attribute *attr,
char *buf) char *buf)
@@ -891,6 +894,10 @@ fw_load_from_user_helper(struct firmware *firmware, const char *name,
{ {
return -ENOENT; return -ENOENT;
} }
/* No abort during direct loading */
#define is_fw_load_aborted(buf) false
#endif /* CONFIG_FW_LOADER_USER_HELPER */ #endif /* CONFIG_FW_LOADER_USER_HELPER */
@@ -901,7 +908,7 @@ static int sync_cached_firmware_buf(struct firmware_buf *buf)
mutex_lock(&fw_lock); mutex_lock(&fw_lock);
while (!test_bit(FW_STATUS_DONE, &buf->status)) { while (!test_bit(FW_STATUS_DONE, &buf->status)) {
if (test_bit(FW_STATUS_ABORT, &buf->status)) { if (is_fw_load_aborted(buf)) {
ret = -ENOENT; ret = -ENOENT;
break; break;
} }
@@ -963,7 +970,7 @@ static int assign_firmware_buf(struct firmware *fw, struct device *device)
struct firmware_buf *buf = fw->priv; struct firmware_buf *buf = fw->priv;
mutex_lock(&fw_lock); mutex_lock(&fw_lock);
if (!buf->size || test_bit(FW_STATUS_ABORT, &buf->status)) { if (!buf->size || is_fw_load_aborted(buf)) {
mutex_unlock(&fw_lock); mutex_unlock(&fw_lock);
return -ENOENT; return -ENOENT;
} }