diff options
| author | Greg Kroah-Hartman <[email protected]> | 2018-04-30 12:08:26 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2018-04-30 12:08:26 +0000 |
| commit | cd4846c5a68da77705164924f47001af3b499dec (patch) | |
| tree | 226295e35148ee7a9d303c6a218790b7a8107976 /drivers/base/firmware_loader/fallback.c | |
| parent | fs: kernfs: Adding new return type vm_fault_t (diff) | |
| parent | Linux v4.17-rc3 (diff) | |
| download | kernel-cd4846c5a68da77705164924f47001af3b499dec.tar.gz kernel-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 <[email protected]>
Diffstat (limited to 'drivers/base/firmware_loader/fallback.c')
| -rw-r--r-- | drivers/base/firmware_loader/fallback.c | 4 |
1 files changed, 2 insertions, 2 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 * |