diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-16 17:13:06 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-16 17:13:06 +0900 |
| commit | cbfb74973753e109f28705f6b98c8c8cc381b047 (patch) | |
| tree | ca7f7ab28137dd4d3267be86fb9abe9903841f2f /include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff) | |
| parent | firmware: dmi_scan: Check DMI structure length (diff) | |
| download | linux-dev-cbfb74973753e109f28705f6b98c8c8cc381b047.tar.xz linux-dev-cbfb74973753e109f28705f6b98c8c8cc381b047.zip | |
Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull dmi fixes from Jean Delvare.
* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
firmware: dmi_scan: Check DMI structure length
firmware: dmi: Fix permissions of product_family
firmware: dmi_scan: Make dmi_walk and dmi_walk_early return real error codes
firmware: dmi_scan: Look for SMBIOS 3 entry point first
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 5e9c74cf8894..9bbf21a516e4 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -136,7 +136,7 @@ static inline int dmi_name_in_vendors(const char *s) { return 0; } static inline int dmi_name_in_serial(const char *s) { return 0; } #define dmi_available 0 static inline int dmi_walk(void (*decode)(const struct dmi_header *, void *), - void *private_data) { return -1; } + void *private_data) { return -ENXIO; } static inline bool dmi_match(enum dmi_field f, const char *str) { return false; } static inline void dmi_memdev_name(u16 handle, const char **bank, |