On Tue, Jan 14, 2025 at 02:32:29PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
> drivers/platform/x86/dell/alienware-wmi.c
>
> between commit:
>
> c1043cdb019e ("alienware-wmi: Fix X Series and G Series quirks")
>
> from Linus' tree and commit:
>
> 7c605f6460e8 ("platform/x86: alienware-wmi: Improve rgb-zones group creation")
>
> from the drivers-x86 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/platform/x86/dell/alienware-wmi.c
> index 341d01d3e3e4,b4b43f3e3fd9..000000000000
> --- a/drivers/platform/x86/dell/alienware-wmi.c
> +++ b/drivers/platform/x86/dell/alienware-wmi.c
> @@@ -694,20 -690,7 +699,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);
> }
Thank you very much. This fix looks good to me.
~ Kurt
>
> static acpi_status alienware_wmax_command(void *in_args, size_t in_size,
