diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
| commit | dda93b45389f025fd3422d22cc31cc1ea6040305 (patch) | |
| tree | 44a856744843e24ed1baf6ca4edb1be04809a606 /drivers/base/firmware_loader/main.c | |
| parent | 2e62024c265aa69315ed02835623740030435380 (diff) | |
| parent | b61b8bba18fe2b63d38fdaf9b83de25e2d787dfe (diff) | |
Merge branch 'x86/cache' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/base/firmware_loader/main.c')
| -rw-r--r-- | drivers/base/firmware_loader/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index b3c0498ee433..8e9213b36e31 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c | |||
| @@ -226,8 +226,11 @@ static int alloc_lookup_fw_priv(const char *fw_name, | |||
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | tmp = __allocate_fw_priv(fw_name, fwc, dbuf, size); | 228 | tmp = __allocate_fw_priv(fw_name, fwc, dbuf, size); |
| 229 | if (tmp && !(opt_flags & FW_OPT_NOCACHE)) | 229 | if (tmp) { |
| 230 | list_add(&tmp->list, &fwc->head); | 230 | INIT_LIST_HEAD(&tmp->list); |
| 231 | if (!(opt_flags & FW_OPT_NOCACHE)) | ||
| 232 | list_add(&tmp->list, &fwc->head); | ||
| 233 | } | ||
| 231 | spin_unlock(&fwc->lock); | 234 | spin_unlock(&fwc->lock); |
| 232 | 235 | ||
| 233 | *fw_priv = tmp; | 236 | *fw_priv = tmp; |
