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.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
+12
-2
+1
MAINTAINERS
+1
MAINTAINERS
···
3841
3841
ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
3842
3842
M: Corentin Chary <corentin.chary@gmail.com>
3843
3843
M: Luke D. Jones <luke@ljones.dev>
3844
+
M: Denis Benato <benato.denis96@gmail.com>
3844
3845
L: platform-driver-x86@vger.kernel.org
3845
3846
S: Maintained
3846
3847
W: https://asus-linux.org/
+1
drivers/platform/mellanox/mlxbf-pmc.c
+1
drivers/platform/mellanox/mlxbf-pmc.c
···
2015
2015
if (pmc->block[blk_num].type == MLXBF_PMC_TYPE_CRSPACE) {
2016
2016
/* Program crspace counters to count clock cycles using "count_clock" sysfs */
2017
2017
attr = &pmc->block[blk_num].attr_count_clock;
2018
+
sysfs_attr_init(&attr->dev_attr.attr);
2018
2019
attr->dev_attr.attr.mode = 0644;
2019
2020
attr->dev_attr.show = mlxbf_pmc_count_clock_show;
2020
2021
attr->dev_attr.store = mlxbf_pmc_count_clock_store;
+10
-2
drivers/platform/x86/dell/alienware-wmi-wmax.c
+10
-2
drivers/platform/x86/dell/alienware-wmi-wmax.c
···
210
210
.driver_data = &g_series_quirks,
211
211
},
212
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
+
},
220
+
{
213
221
.ident = "Dell Inc. G16 7630",
214
222
.matches = {
215
223
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
···
1647
1639
1648
1640
static int wmax_wmi_suspend(struct device *dev)
1649
1641
{
1650
-
if (awcc->hwmon)
1642
+
if (awcc && awcc->hwmon)
1651
1643
awcc_hwmon_suspend(dev);
1652
1644
1653
1645
return 0;
···
1655
1647
1656
1648
static int wmax_wmi_resume(struct device *dev)
1657
1649
{
1658
-
if (awcc->hwmon)
1650
+
if (awcc && awcc->hwmon)
1659
1651
awcc_hwmon_resume(dev);
1660
1652
1661
1653
return 0;