From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Date: Mon, 20 Jan 2025 12:22:06 +0000 (+0200)
Subject: Merge branch 'fixes' into 'for-next'
X-Git-Tag: v6.14-rc1~117^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0da9a3f9ac8ada83fa79579455871ec59f11db72;p=thirdparty%2Flinux.git

Merge branch 'fixes' into 'for-next'

Merged the 'fixes' branch into the 'for-next' branch to resolve
a conflict in alienware-wmi zone teardown code.
---

0da9a3f9ac8ada83fa79579455871ec59f11db72
diff --cc drivers/platform/x86/dell/alienware-wmi.c
index 63cf016bc9128,341d01d3e3e4c..e252e0cf47efe
--- a/drivers/platform/x86/dell/alienware-wmi.c
+++ b/drivers/platform/x86/dell/alienware-wmi.c
@@@ -689,7 -694,20 +698,10 @@@ static int alienware_zone_init(struct p
  
  static void alienware_zone_exit(struct platform_device *dev)
  {
 -	u8 zone;
 -
+ 	if (!quirks->num_zones)
+ 		return;
+ 
 -	sysfs_remove_group(&dev->dev.kobj, &zone_attribute_group);
  	led_classdev_unregister(&global_led);
 -	if (zone_dev_attrs) {
 -		for (zone = 0; zone < quirks->num_zones; zone++)
 -			kfree(zone_dev_attrs[zone].attr.name);
 -	}
 -	kfree(zone_dev_attrs);
 -	kfree(zone_data);
 -	kfree(zone_attrs);
  }
  
  static acpi_status alienware_wmax_command(void *in_args, size_t in_size,
diff --cc drivers/platform/x86/hp/hp-wmi.c
index ee3a915dd6cef,20c55bab3b8cc..db5fdee2109ce
--- a/drivers/platform/x86/hp/hp-wmi.c
+++ b/drivers/platform/x86/hp/hp-wmi.c
@@@ -84,10 -80,10 +84,10 @@@ static const char * const omen_thermal_
   * "balanced" when reaching zero.
   */
  static const char * const omen_timed_thermal_profile_boards[] = {
- 	"8BAD", "8A42"
+ 	"8BAD", "8A42", "8A15"
  };
  
 -/* DMI Board names of Victus laptops */
 +/* DMI Board names of Victus 16-d1xxx laptops */
  static const char * const victus_thermal_profile_boards[] = {
  	"8A25"
  };