Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9268200 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Jean Delvare
Browse files

firmware: dmi_scan: Make dmi_walk and dmi_walk_early return real error codes 



Currently they return -1 on error, which will confuse callers if
they try to interpret it as a normal negative error code.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
parent c9aba143

drivers/firmware/dmi_scan.c

+5 −4
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int __init dmi_walk_early(void (*decode)(const struct dmi_header *, 


	buf = dmi_early_remap(dmi_base, orig_dmi_len);

	if (buf == NULL)

		return -1;

		return -ENOMEM;



	dmi_decode_table(buf, decode, NULL);
@@ -1008,7 +1008,8 @@ EXPORT_SYMBOL(dmi_get_date); 
 *	@decode: Callback function

 *	@private_data: Private data to be passed to the callback function

 *

 *	Returns -1 when the DMI table can't be reached, 0 on success.

 *	Returns 0 on success, -ENXIO if DMI is not selected or not present,

 *	or a different negative error code if DMI walking fails.

 */

int dmi_walk(void (*decode)(const struct dmi_header *, void *),

	     void *private_data)
@@ -1016,11 +1017,11 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *), 
	u8 *buf;



	if (!dmi_available)

		return -1;

		return -ENXIO;



	buf = dmi_remap(dmi_base, dmi_len);

	if (buf == NULL)

		return -1;

		return -ENOMEM;



	dmi_decode_table(buf, decode, private_data);

include/linux/dmi.h

+1 −1
Original line number Diff line number Diff line
@@ -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,