diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-03-25 21:11:58 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-03-25 21:11:58 +0100 |
| commit | 36a1818f5a1e50b805317ba13f827067d50f6970 (patch) | |
| tree | b9414b9509bea9f006c292a46a7632ffb57d18ee /drivers/base/firmware_loader/main.c | |
| parent | 2295bd846765c766701e666ed2e4b35396be25e6 (diff) | |
| parent | 4cece764965020c22cff7665b18a012006359095 (diff) | |
| download | linux-36a1818f5a1e50b805317ba13f827067d50f6970.tar.gz linux-36a1818f5a1e50b805317ba13f827067d50f6970.tar.bz2 linux-36a1818f5a1e50b805317ba13f827067d50f6970.zip | |
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get drm-misc-fixes to the state of v6.9-rc1.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/base/firmware_loader/main.c')
| -rw-r--r-- | drivers/base/firmware_loader/main.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index ea28102d421e..da8ca01d011c 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -551,12 +551,16 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, file_size_ptr, READING_FIRMWARE); if (rc < 0) { - if (rc != -ENOENT) - dev_warn(device, "loading %s failed with error %d\n", - path, rc); - else - dev_dbg(device, "loading %s failed for no such file or directory.\n", - path); + if (!(fw_priv->opt_flags & FW_OPT_NO_WARN)) { + if (rc != -ENOENT) + dev_warn(device, + "loading %s failed with error %d\n", + path, rc); + else + dev_dbg(device, + "loading %s failed for no such file or directory.\n", + path); + } continue; } size = rc; |