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

Commit 0263d4eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.10-4' of git://git.infradead.org/linux-platform-drivers-x86 

Pull x86 platform-driver fixes from Andy Shevchenko:
 "This is my first pull request since I become a co-maintainer of
  Platform Drivers x86 subsystem. It's a bit bigger than usual due to
  material collected for almost two weeks in a row.

  MAINTAINERS:
   - Add myself to X86 PLATFORM DRIVERS as a co-maintainer

  ideapad-laptop:
   - handle ACPI event 1

  intel_mid_powerbtn:
   - Set IRQ_ONESHOT

  surface3-wmi:
   - fix uninitialized symbol
   - Shut up unused-function warning

  mlx-platform:
   - free first dev on error"

* tag 'platform-drivers-x86-v4.10-4' of git://git.infradead.org/linux-platform-drivers-x86:
  MAINTAINERS: Add myself to X86 PLATFORM DRIVERS as a co-maintainer
  platform/x86: ideapad-laptop: handle ACPI event 1
  platform/x86: intel_mid_powerbtn: Set IRQ_ONESHOT
  platform/x86: surface3-wmi: fix uninitialized symbol
  platform/x86: surface3-wmi: Shut up unused-function warning
  platform/x86: mlx-platform: free first dev on error
parents 19ca2c8f 7b9e1d89

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13453,6 +13453,7 @@ F: arch/x86/ 


X86 PLATFORM DRIVERS

M:	Darren Hart <dvhart@infradead.org>

M:	Andy Shevchenko <andy@infradead.org>

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

T:	git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git

S:	Maintained

drivers/platform/x86/ideapad-laptop.c

+1 −0
Original line number Diff line number Diff line
@@ -813,6 +813,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) 
			case 8:

			case 7:

			case 6:

			case 1:

				ideapad_input_report(priv, vpc_bit);

				break;

			case 5:

drivers/platform/x86/intel_mid_powerbtn.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int mfld_pb_probe(struct platform_device *pdev) 


	input_set_capability(input, EV_KEY, KEY_POWER);



	error = request_threaded_irq(irq, NULL, mfld_pb_isr, 0,

	error = request_threaded_irq(irq, NULL, mfld_pb_isr, IRQF_ONESHOT,

				     DRIVER_NAME, input);

	if (error) {

		dev_err(&pdev->dev, "Unable to request irq %d for mfld power"

drivers/platform/x86/mlx-platform.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int __init mlxplat_init(void) 
	return 0;



fail_platform_mux_register:

	for (i--; i > 0 ; i--)

	while (--i >= 0)

		platform_device_unregister(priv->pdev_mux[i]);

	platform_device_unregister(priv->pdev_i2c);

fail_alloc:

drivers/platform/x86/surface3-wmi.c

+2 −4
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static acpi_status s3_wmi_attach_spi_device(acpi_handle handle, 


static int s3_wmi_check_platform_device(struct device *dev, void *data)

{

	struct acpi_device *adev, *ts_adev;

	struct acpi_device *adev, *ts_adev = NULL;

	acpi_handle handle;

	acpi_status status;
@@ -244,13 +244,11 @@ static int s3_wmi_remove(struct platform_device *device) 
	return 0;

}



#ifdef CONFIG_PM

static int s3_wmi_resume(struct device *dev)

static int __maybe_unused s3_wmi_resume(struct device *dev)

{

	s3_wmi_send_lid_state();

	return 0;

}

#endif

static SIMPLE_DEV_PM_OPS(s3_wmi_pm, NULL, s3_wmi_resume);



static struct platform_driver s3_wmi_driver = {