Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-10
+1
drivers/platform/x86/asus-nb-wmi.c
+1
drivers/platform/x86/asus-nb-wmi.c
···
623
623
{ KE_KEY, 0xC4, { KEY_KBDILLUMUP } },
624
624
{ KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } },
625
625
{ KE_IGNORE, 0xC6, }, /* Ambient Light Sensor notification */
626
+
{ KE_IGNORE, 0xCF, }, /* AC mode */
626
627
{ KE_KEY, 0xFA, { KEY_PROG2 } }, /* Lid flip action */
627
628
{ KE_KEY, 0xBD, { KEY_PROG2 } }, /* Lid flip action on ROG xflow laptops */
628
629
{ KE_END, 0},
+2
-9
drivers/platform/x86/asus-wmi.c
+2
-9
drivers/platform/x86/asus-wmi.c
···
3696
3696
/* Throttle thermal policy ****************************************************/
3697
3697
static int throttle_thermal_policy_write(struct asus_wmi *asus)
3698
3698
{
3699
-
u32 retval;
3700
3699
u8 value;
3701
3700
int err;
3702
3701
···
3717
3718
value = asus->throttle_thermal_policy_mode;
3718
3719
}
3719
3720
3720
-
err = asus_wmi_set_devstate(asus->throttle_thermal_policy_dev,
3721
-
value, &retval);
3721
+
/* Some machines do not return an error code as a result, so we ignore it */
3722
+
err = asus_wmi_set_devstate(asus->throttle_thermal_policy_dev, value, NULL);
3722
3723
3723
3724
sysfs_notify(&asus->platform_device->dev.kobj, NULL,
3724
3725
"throttle_thermal_policy");
···
3726
3727
if (err) {
3727
3728
pr_warn("Failed to set throttle thermal policy: %d\n", err);
3728
3729
return err;
3729
-
}
3730
-
3731
-
if (retval != 1) {
3732
-
pr_warn("Failed to set throttle thermal policy (retval): 0x%x\n",
3733
-
retval);
3734
-
return -EIO;
3735
3730
}
3736
3731
3737
3732
/* Must set to disabled if mode is toggled */