diff options
| author | Michel Lespinasse <walken@google.com> | 2014-01-28 08:06:21 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-15 14:29:56 -0500 |
| commit | b12b73f1ca7763a94e0949a0d86eea40b5f69ea6 (patch) | |
| tree | e4766c8495c0457811908454646194dd5e154250 /drivers/firmware/google | |
| parent | 4272b9611c30f99f51590085998129480f2fe45e (diff) | |
firmware: fix google/gsmi duplicate efivars_sysfs_init()
Starting in commit e14ab23dde12b80db4c94b684a2e485b72b16af3,
efivars_sysfs_init() is called both by itself as an init function,
and by drivers/firmware/google/gsmi.c gsmi_init().
This results in runtime warnings such as the following:
[ 5.651330] WARNING: at fs/sysfs/dir.c:530 sysfs_add_one+0xbd/0xe0()
[ 5.657699] sysfs: cannot create duplicate filename '/firmware/gsmi/vars'
Fixing this by removing the redundant efivars_sysfs_init() call in
gsmi_init().
Tested: booted, checked that /firmware/gsmi/vars was still present and
showed the expected contents.
Signed-off-by: Michel Lespinasse <walken@google.com>
Acked-by: Matt Fleming <matt.fleming@intel.com>
Acked-by: Mike Waychison <mikew@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/google')
| -rw-r--r-- | drivers/firmware/google/gsmi.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c index e5a67b24587a..f1ab05ea56bb 100644 --- a/drivers/firmware/google/gsmi.c +++ b/drivers/firmware/google/gsmi.c | |||
| @@ -892,13 +892,6 @@ static __init int gsmi_init(void) | |||
| 892 | goto out_remove_sysfs_files; | 892 | goto out_remove_sysfs_files; |
| 893 | } | 893 | } |
| 894 | 894 | ||
| 895 | ret = efivars_sysfs_init(); | ||
| 896 | if (ret) { | ||
| 897 | printk(KERN_INFO "gsmi: Failed to create efivars files\n"); | ||
| 898 | efivars_unregister(&efivars); | ||
| 899 | goto out_remove_sysfs_files; | ||
| 900 | } | ||
| 901 | |||
| 902 | register_reboot_notifier(&gsmi_reboot_notifier); | 895 | register_reboot_notifier(&gsmi_reboot_notifier); |
| 903 | register_die_notifier(&gsmi_die_notifier); | 896 | register_die_notifier(&gsmi_die_notifier); |
| 904 | atomic_notifier_chain_register(&panic_notifier_list, | 897 | atomic_notifier_chain_register(&panic_notifier_list, |
