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

Commit 6a7492a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86 

Pull x86 platform driver fixes from Matthew Garrett:
 "Three trivial fixes - the first reverts a patch that's broken some
  other devices (again - I'm trying to figure out a clean way to
  implement this), the other two fix minor issues in the sony-laptop
  driver"

* 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86:
  Revert "hp-wmi: Enable hotkeys on some systems"
  sony-laptop: Fix reporting of gfx_switch_status
  sony-laptop: return a negative error code in sonypi_compat_init()
parents 1f8b7665 41c8bd1c

drivers/platform/x86/hp-wmi.c

+0 −16
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4"); 
#define HPWMI_ALS_QUERY 0x3

#define HPWMI_HARDWARE_QUERY 0x4

#define HPWMI_WIRELESS_QUERY 0x5

#define HPWMI_BIOS_QUERY 0x9

#define HPWMI_HOTKEY_QUERY 0xc

#define HPWMI_WIRELESS2_QUERY 0x1b

#define HPWMI_POSTCODEERROR_QUERY 0x2a
@@ -293,19 +292,6 @@ static int hp_wmi_tablet_state(void) 
	return (state & 0x4) ? 1 : 0;

}



static int hp_wmi_enable_hotkeys(void)

{

	int ret;

	int query = 0x6e;



	ret = hp_wmi_perform_query(HPWMI_BIOS_QUERY, 1, &query, sizeof(query),

				   0);



	if (ret)

		return -EINVAL;

	return 0;

}



static int hp_wmi_set_block(void *data, bool blocked)

{

	enum hp_wmi_radio r = (enum hp_wmi_radio) data;
@@ -1009,8 +995,6 @@ static int __init hp_wmi_init(void) 
		err = hp_wmi_input_setup();

		if (err)

			return err;



		hp_wmi_enable_hotkeys();

	}



	if (bios_capable) {

drivers/platform/x86/sony-laptop.c

+6 −2
Original line number Diff line number Diff line
@@ -2440,7 +2440,10 @@ static ssize_t sony_nc_gfx_switch_status_show(struct device *dev, 
	if (pos < 0)

		return pos;



	return snprintf(buffer, PAGE_SIZE, "%s\n", pos ? "speed" : "stamina");

	return snprintf(buffer, PAGE_SIZE, "%s\n",

					pos == SPEED ? "speed" :

					pos == STAMINA ? "stamina" :

					pos == AUTO ? "auto" : "unknown");

}



static int sony_nc_gfx_switch_setup(struct platform_device *pd,
@@ -4320,7 +4323,8 @@ static int sony_pic_add(struct acpi_device *device) 
		goto err_free_resources;

	}



	if (sonypi_compat_init())

	result = sonypi_compat_init();

	if (result)

		goto err_remove_input;



	/* request io port */