Skip to content

Commit dd72c8f

Browse files
committed
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
2 parents 250a17e + 34cbd6e commit dd72c8f

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3841,6 +3841,7 @@ F: drivers/hwmon/asus-ec-sensors.c
38413841
ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
38423842
M: Corentin Chary <corentin.chary@gmail.com>
38433843
M: Luke D. Jones <luke@ljones.dev>
3844+
M: Denis Benato <benato.denis96@gmail.com>
38443845
L: platform-driver-x86@vger.kernel.org
38453846
S: Maintained
38463847
W: https://asus-linux.org/

drivers/platform/mellanox/mlxbf-pmc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,6 +2015,7 @@ static int mlxbf_pmc_init_perftype_counter(struct device *dev, unsigned int blk_
20152015
if (pmc->block[blk_num].type == MLXBF_PMC_TYPE_CRSPACE) {
20162016
/* Program crspace counters to count clock cycles using "count_clock" sysfs */
20172017
attr = &pmc->block[blk_num].attr_count_clock;
2018+
sysfs_attr_init(&attr->dev_attr.attr);
20182019
attr->dev_attr.attr.mode = 0644;
20192020
attr->dev_attr.show = mlxbf_pmc_count_clock_show;
20202021
attr->dev_attr.store = mlxbf_pmc_count_clock_store;

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,14 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = {
209209
},
210210
.driver_data = &g_series_quirks,
211211
},
212+
{
213+
.ident = "Dell Inc. G15 5530",
214+
.matches = {
215+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
216+
DMI_MATCH(DMI_PRODUCT_NAME, "Dell G15 5530"),
217+
},
218+
.driver_data = &g_series_quirks,
219+
},
212220
{
213221
.ident = "Dell Inc. G16 7630",
214222
.matches = {
@@ -1639,15 +1647,15 @@ static int wmax_wmi_probe(struct wmi_device *wdev, const void *context)
16391647

16401648
static int wmax_wmi_suspend(struct device *dev)
16411649
{
1642-
if (awcc->hwmon)
1650+
if (awcc && awcc->hwmon)
16431651
awcc_hwmon_suspend(dev);
16441652

16451653
return 0;
16461654
}
16471655

16481656
static int wmax_wmi_resume(struct device *dev)
16491657
{
1650-
if (awcc->hwmon)
1658+
if (awcc && awcc->hwmon)
16511659
awcc_hwmon_resume(dev);
16521660

16531661
return 0;

0 commit comments

Comments
 (0)