Commit 45e21289 authored by Mark Pearson's avatar Mark Pearson Committed by Hans de Goede
Browse files

platform/x86: think-lmi: use correct possible_values delimiters 



firmware-attributes class requires that possible values are delimited
using ';' but the Lenovo firmware uses ',' instead.
Parse string and replace where appropriate.

Suggested-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Fixes: a40cd7ef ("platform/x86: think-lmi: Add WMI interface support on Lenovo platforms")
Signed-off-by: default avatarMark Pearson <mpearson-lenovo@squebb.ca>
Link: https://lore.kernel.org/r/20230320003221.561750-2-mpearson-lenovo@squebb.ca


Reviewed-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 583329dc

drivers/platform/x86/think-lmi.c

+8 −1
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, 


	if (setting->possible_values) {

		/* Figure out what setting type is as BIOS does not return this */

		if (strchr(setting->possible_values, ','))

		if (strchr(setting->possible_values, ';'))

			return sysfs_emit(buf, "enumeration\n");

	}

	/* Anything else is going to be a string */
@@ -1441,6 +1441,13 @@ static int tlmi_analyze(void) 
				pr_info("Error retrieving possible values for %d : %s\n",

						i, setting->display_name);

		}

		/*

		 * firmware-attributes requires that possible_values are separated by ';' but

		 * Lenovo FW uses ','. Replace appropriately.

		 */

		if (setting->possible_values)

			strreplace(setting->possible_values, ',', ';');



		kobject_init(&setting->kobj, &tlmi_attr_setting_ktype);

		tlmi_priv.setting[i] = setting;

		kfree(item);