Commit 0769a8f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.13-2' of... 

Merge tag 'platform-drivers-x86-v6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Ilpo Järvinen:

 - asus-nb-wmi: Silence unknown event warning when charger is plugged in

 - asus-wmi: Handle return code variations during thermal policy writing
   graciously

 - samsung-laptop: Correct module description

* tag 'platform-drivers-x86-v6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: asus-nb-wmi: Ignore unknown event 0xCF
  platform/x86: asus-wmi: Ignore return value when writing thermal policy
  platform/x86: samsung-laptop: Match MODULE_DESCRIPTION() to functionality
parents feffde68 e9fba20c

drivers/platform/x86/asus-nb-wmi.c

+1 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { 
	{ KE_KEY, 0xC4, { KEY_KBDILLUMUP } },

	{ KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } },

	{ KE_IGNORE, 0xC6, },  /* Ambient Light Sensor notification */

	{ KE_IGNORE, 0xCF, },	/* AC mode */

	{ KE_KEY, 0xFA, { KEY_PROG2 } },           /* Lid flip action */

	{ KE_KEY, 0xBD, { KEY_PROG2 } },           /* Lid flip action on ROG xflow laptops */

	{ KE_END, 0},

drivers/platform/x86/asus-wmi.c

+2 −9
Original line number Diff line number Diff line
@@ -3696,7 +3696,6 @@ static int asus_wmi_custom_fan_curve_init(struct asus_wmi *asus) 
/* Throttle thermal policy ****************************************************/

static int throttle_thermal_policy_write(struct asus_wmi *asus)

{

	u32 retval;

	u8 value;

	int err;
@@ -3718,8 +3717,8 @@ static int throttle_thermal_policy_write(struct asus_wmi *asus) 
		value = asus->throttle_thermal_policy_mode;

	}



	err = asus_wmi_set_devstate(asus->throttle_thermal_policy_dev,

				    value, &retval);

	/* Some machines do not return an error code as a result, so we ignore it */

	err = asus_wmi_set_devstate(asus->throttle_thermal_policy_dev, value, NULL);



	sysfs_notify(&asus->platform_device->dev.kobj, NULL,

			"throttle_thermal_policy");
@@ -3729,12 +3728,6 @@ static int throttle_thermal_policy_write(struct asus_wmi *asus) 
		return err;

	}



	if (retval != 1) {

		pr_warn("Failed to set throttle thermal policy (retval): 0x%x\n",

			retval);

		return -EIO;

	}



	/* Must set to disabled if mode is toggled */

	if (asus->cpu_fan_curve_available)

		asus->custom_fan_curves[FAN_CURVE_DEV_CPU].enabled = false;

drivers/platform/x86/samsung-laptop.c

+1 −1
Original line number Diff line number Diff line
@@ -1653,5 +1653,5 @@ module_init(samsung_init); 
module_exit(samsung_exit);



MODULE_AUTHOR("Greg Kroah-Hartman <gregkh@suse.de>");

MODULE_DESCRIPTION("Samsung Backlight driver");

MODULE_DESCRIPTION("Samsung Laptop driver");

MODULE_LICENSE("GPL");