diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-05 11:56:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-05 11:56:35 -0700 |
| commit | 672a9c106966f8d418478830975288b8096bb058 (patch) | |
| tree | e47259d8a96084affaab87b0104b56ac352dc0eb /drivers/firmware | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (diff) | |
| parent | kfifo: fix inaccurate comment (diff) | |
| download | linux-dev-672a9c106966f8d418478830975288b8096bb058.tar.xz linux-dev-672a9c106966f8d418478830975288b8096bb058.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
kfifo: fix inaccurate comment
tools/thermal: tmon: fix for segfault
net: Spelling s/stucture/structure/
edd: don't spam log if no EDD information is present
Documentation: Fix early-microcode.txt references after file rename
tracing: Block comments should align the * on each line
treewide: Fix typos in printk
GenWQE: Fix a typo in two comments
treewide: Align function definition open/close braces
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/edd.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c index 60a8f1363a10..1b82c89a49df 100644 --- a/drivers/firmware/edd.c +++ b/drivers/firmware/edd.c @@ -748,14 +748,12 @@ edd_init(void) int rc=0; struct edd_device *edev; + if (!edd_num_devices()) + return -ENODEV; + printk(KERN_INFO "BIOS EDD facility v%s %s, %d devices found\n", EDD_VERSION, EDD_DATE, edd_num_devices()); - if (!edd_num_devices()) { - printk(KERN_INFO "EDD information not available.\n"); - return -ENODEV; - } - edd_kset = kset_create_and_add("edd", NULL, firmware_kobj); if (!edd_kset) return -ENOMEM; |