diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 23:33:12 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 23:33:12 +0300 |
| commit | c13aca79ff3c4af5fd31a5b2743a90eba6e36a26 (patch) | |
| tree | 8f77894f61822d1ae5285c07c801af7c62f71afd /drivers/firmware/edd.c | |
| parent | 40f7090bb1b4ec327ea1e1402ff5783af5b35195 (diff) | |
| parent | 5ca4d1ae9bad0f59bd6f851c39b19f5366953666 (diff) | |
| download | linux-c13aca79ff3c4af5fd31a5b2743a90eba6e36a26.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 4.18 merge window.
Diffstat (limited to 'drivers/firmware/edd.c')
| -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; |