Skip to content

Commit d4afb44

Browse files
committed
deepin: firmware_loader: move log failed to load firmware to real failed
Fixes: f081e61 ("debian: firmware_loader: Log direct loading failures as info for d-i") Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 642fb17 commit d4afb44

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

  • drivers/base/firmware_loader

drivers/base/firmware_loader/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -585,10 +585,6 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv,
585585
}
586586
__putname(path);
587587

588-
if (rc)
589-
dev_info(device, "firmware: failed to load %s (%d)\n",
590-
fw_priv->fw_name, rc);
591-
592588
return rc;
593589
}
594590

@@ -931,6 +927,10 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
931927
if (ret == -ENOENT && nondirect)
932928
ret = firmware_fallback_platform(fw->priv);
933929

930+
if (ret)
931+
dev_info(device, "firmware: failed to load %s (%d)\n",
932+
fw_priv->fw_name, ret);
933+
934934
if (ret) {
935935
if (!(opt_flags & FW_OPT_NO_WARN))
936936
dev_warn(device,

0 commit comments

Comments
 (0)