Commit dd72c8fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull x86 platform driver fixes from Ilpo Järvinen:

 - alienware-wmi-wmax:
     - Fix NULL pointer dereference in sleep handlers
     - Add AWCC support to Dell G15 5530

 - mellanox: mlxbf-pmc: add sysfs_attr_init() to count_clock init

* tag 'platform-drivers-x86-v6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: alienware-wmi-wmax: Add AWCC support to Dell G15 5530
  MAINTAINERS: add Denis Benato as maintainer for asus notebooks
  platform/mellanox: mlxbf-pmc: add sysfs_attr_init() to count_clock init
  platform/x86: alienware-wmi-wmax: Fix NULL pointer dereference in sleep handlers
parents 250a17e8 34cbd6e0

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3841,6 +3841,7 @@ F: drivers/hwmon/asus-ec-sensors.c 
ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS

M:	Corentin Chary <corentin.chary@gmail.com>

M:	Luke D. Jones <luke@ljones.dev>

M:	Denis Benato <benato.denis96@gmail.com>

L:	platform-driver-x86@vger.kernel.org

S:	Maintained

W:	https://asus-linux.org/

drivers/platform/mellanox/mlxbf-pmc.c

+1 −0
Original line number Diff line number Diff line
@@ -2015,6 +2015,7 @@ static int mlxbf_pmc_init_perftype_counter(struct device *dev, unsigned int blk_ 
	if (pmc->block[blk_num].type == MLXBF_PMC_TYPE_CRSPACE) {

		/* Program crspace counters to count clock cycles using "count_clock" sysfs */

		attr = &pmc->block[blk_num].attr_count_clock;

		sysfs_attr_init(&attr->dev_attr.attr);

		attr->dev_attr.attr.mode = 0644;

		attr->dev_attr.show = mlxbf_pmc_count_clock_show;

		attr->dev_attr.store = mlxbf_pmc_count_clock_store;

drivers/platform/x86/dell/alienware-wmi-wmax.c

+10 −2
Original line number Diff line number Diff line
@@ -209,6 +209,14 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = { 
		},

		.driver_data = &g_series_quirks,

	},

	{

		.ident = "Dell Inc. G15 5530",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Dell G15 5530"),

		},

		.driver_data = &g_series_quirks,

	},

	{

		.ident = "Dell Inc. G16 7630",

		.matches = {
@@ -1639,7 +1647,7 @@ static int wmax_wmi_probe(struct wmi_device *wdev, const void *context) 


static int wmax_wmi_suspend(struct device *dev)

{

	if (awcc->hwmon)

	if (awcc && awcc->hwmon)

		awcc_hwmon_suspend(dev);



	return 0;
@@ -1647,7 +1655,7 @@ static int wmax_wmi_suspend(struct device *dev) 


static int wmax_wmi_resume(struct device *dev)

{

	if (awcc->hwmon)

	if (awcc && awcc->hwmon)

		awcc_hwmon_resume(dev);



	return 0;