Commit 921863fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.10-4' of... 

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

Pull x86 platform driver fixes from Hans de Goede:

 - Fix lg-laptop driver not working with 2024 LG laptop models

 - Add missing MODULE_DESCRIPTION() macros to various modules

 - nvsw-sn2201: Add check for platform_device_add_resources

* tag 'platform-drivers-x86-v6.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: add missing MODULE_DESCRIPTION() macros
  platform/x86/intel: add missing MODULE_DESCRIPTION() macros
  platform/x86/siemens: add missing MODULE_DESCRIPTION() macros
  platform/x86: lg-laptop: Use ACPI device handle when evaluating WMAB/WMBB
  platform/x86: lg-laptop: Change ACPI device id
  platform/x86: lg-laptop: Remove LGEX0815 hotkey handling
  platform/x86: wireless-hotkey: Add support for LG Airplane Button
  platform/mellanox: nvsw-sn2201: Add check for platform_device_add_resources
parents a8938580 7add1ee3

drivers/platform/mellanox/nvsw-sn2201.c

+4 −1
Original line number Diff line number Diff line
@@ -1198,6 +1198,7 @@ static int nvsw_sn2201_config_pre_init(struct nvsw_sn2201 *nvsw_sn2201) 
static int nvsw_sn2201_probe(struct platform_device *pdev)

{

	struct nvsw_sn2201 *nvsw_sn2201;

	int ret;



	nvsw_sn2201 = devm_kzalloc(&pdev->dev, sizeof(*nvsw_sn2201), GFP_KERNEL);

	if (!nvsw_sn2201)
@@ -1205,8 +1206,10 @@ static int nvsw_sn2201_probe(struct platform_device *pdev) 


	nvsw_sn2201->dev = &pdev->dev;

	platform_set_drvdata(pdev, nvsw_sn2201);

	platform_device_add_resources(pdev, nvsw_sn2201_lpc_io_resources,

	ret = platform_device_add_resources(pdev, nvsw_sn2201_lpc_io_resources,

				      ARRAY_SIZE(nvsw_sn2201_lpc_io_resources));

	if (ret)

		return ret;



	nvsw_sn2201->main_mux_deferred_nr = NVSW_SN2201_MAIN_MUX_DEFER_NR;

	nvsw_sn2201->main_mux_devs = nvsw_sn2201_main_mux_brdinfo;

drivers/platform/x86/amilo-rfkill.c

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ static void __exit amilo_rfkill_exit(void) 
}



MODULE_AUTHOR("Ben Hutchings <ben@decadent.org.uk>");

MODULE_DESCRIPTION("Fujitsu-Siemens Amilo rfkill support");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(dmi, amilo_rfkill_id_table);

drivers/platform/x86/firmware_attributes_class.c

+1 −0
Original line number Diff line number Diff line
@@ -49,4 +49,5 @@ int fw_attributes_class_put(void) 
EXPORT_SYMBOL_GPL(fw_attributes_class_put);



MODULE_AUTHOR("Mark Pearson <markpearson@lenovo.com>");

MODULE_DESCRIPTION("Firmware attributes class helper module");

MODULE_LICENSE("GPL");

drivers/platform/x86/ibm_rtl.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ static bool debug; 
module_param(debug, bool, 0644);

MODULE_PARM_DESC(debug, "Show debug output");



MODULE_DESCRIPTION("IBM Premium Real Time Mode (PRTM) driver");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Keith Mannthey <kmmanth@us.ibm.com>");

MODULE_AUTHOR("Vernon Mauery <vernux@us.ibm.com>");

drivers/platform/x86/intel/hid.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ MODULE_PARM_DESC(enable_sw_tablet_mode, 
/* When NOT in tablet mode, VGBS returns with the flag 0x40 */

#define TABLET_MODE_FLAG BIT(6)



MODULE_DESCRIPTION("Intel HID Event hotkey driver");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Alex Hung");