diff options
author | 2018-04-30 05:08:26 -0700 | |
---|---|---|
committer | 2018-04-30 05:08:26 -0700 | |
commit | cd4846c5a68da77705164924f47001af3b499dec (patch) | |
tree | 226295e35148ee7a9d303c6a218790b7a8107976 /drivers/base/firmware_loader | |
parent | fs: kernfs: Adding new return type vm_fault_t (diff) | |
parent | Linux v4.17-rc3 (diff) | |
download | linux-dev-cd4846c5a68da77705164924f47001af3b499dec.tar.xz linux-dev-cd4846c5a68da77705164924f47001af3b499dec.zip |
Merge 4.17-rc3 into driver-core-next
We want the fixes in here as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/firmware_loader')
-rw-r--r-- | drivers/base/firmware_loader/fallback.c | 4 | ||||
-rw-r--r-- | drivers/base/firmware_loader/fallback.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c index 31b5015b59fe..358354148dec 100644 --- a/drivers/base/firmware_loader/fallback.c +++ b/drivers/base/firmware_loader/fallback.c @@ -537,8 +537,8 @@ exit: } /** - * fw_load_sysfs_fallback - load a firmware via the syfs fallback mechanism - * @fw_sysfs: firmware syfs information for the firmware to load + * fw_load_sysfs_fallback - load a firmware via the sysfs fallback mechanism + * @fw_sysfs: firmware sysfs information for the firmware to load * @opt_flags: flags of options, FW_OPT_* * @timeout: timeout to wait for the load * diff --git a/drivers/base/firmware_loader/fallback.h b/drivers/base/firmware_loader/fallback.h index dfebc644ed35..f8255670a663 100644 --- a/drivers/base/firmware_loader/fallback.h +++ b/drivers/base/firmware_loader/fallback.h @@ -6,7 +6,7 @@ #include <linux/device.h> /** - * struct firmware_fallback_config - firmware fallback configuratioon settings + * struct firmware_fallback_config - firmware fallback configuration settings * * Helps describe and fine tune the fallback mechanism. * |