Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ce05a4e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.1-2' of... 

Merge tag 'platform-drivers-x86-v4.1-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "This includes a trivial warning and adding a Lenovo laptop to an
  existing quirk.

  I've held off on things like the latter in the past, but I didn't feel
  it was risky enough to push out to 4.2.

   - thinkpad_acpi:
        Fix warning for static not at beginning

   - ideapad_laptop:
        Add Lenovo G40-30 to devices without radio switch"

* tag 'platform-drivers-x86-v4.1-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  thinkpad_acpi: Fix warning for static not at beginning
  ideapad_laptop: Add Lenovo G40-30 to devices without radio switch
parents d9cee5d4 df6dd1b3

drivers/platform/x86/ideapad-laptop.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -829,6 +829,13 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) 
 * report all radios as hardware-blocked.

 * report all radios as hardware-blocked.

 */

 */

static const struct dmi_system_id no_hw_rfkill_list[] = {

static const struct dmi_system_id no_hw_rfkill_list[] = {

	{

		.ident = "Lenovo G40-30",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G40-30"),

		},

	},

	{

	{

		.ident = "Lenovo Yoga 2 11 / 13 / Pro",

		.ident = "Lenovo Yoga 2 11 / 13 / Pro",

		.matches = {

		.matches = {

drivers/platform/x86/thinkpad_acpi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2115,7 +2115,7 @@ static int hotkey_mask_get(void) 
	return 0;

	return 0;

}

}





void static hotkey_mask_warn_incomplete_mask(void)

static void hotkey_mask_warn_incomplete_mask(void)

{

{

	/* log only what the user can fix... */

	/* log only what the user can fix... */

	const u32 wantedmask = hotkey_driver_mask &

	const u32 wantedmask = hotkey_driver_mask &