Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+6
-18
-16
drivers/platform/x86/hp-wmi.c
-16
drivers/platform/x86/hp-wmi.c
···
53
53
#define HPWMI_ALS_QUERY 0x3
54
54
#define HPWMI_HARDWARE_QUERY 0x4
55
55
#define HPWMI_WIRELESS_QUERY 0x5
56
-
#define HPWMI_BIOS_QUERY 0x9
57
56
#define HPWMI_HOTKEY_QUERY 0xc
58
57
#define HPWMI_WIRELESS2_QUERY 0x1b
59
58
#define HPWMI_POSTCODEERROR_QUERY 0x2a
···
290
291
return ret;
291
292
292
293
return (state & 0x4) ? 1 : 0;
293
-
}
294
-
295
-
static int hp_wmi_enable_hotkeys(void)
296
-
{
297
-
int ret;
298
-
int query = 0x6e;
299
-
300
-
ret = hp_wmi_perform_query(HPWMI_BIOS_QUERY, 1, &query, sizeof(query),
301
-
0);
302
-
303
-
if (ret)
304
-
return -EINVAL;
305
-
return 0;
306
294
}
307
295
308
296
static int hp_wmi_set_block(void *data, bool blocked)
···
995
1009
err = hp_wmi_input_setup();
996
1010
if (err)
997
1011
return err;
998
-
999
-
hp_wmi_enable_hotkeys();
1000
1012
}
1001
1013
1002
1014
if (bios_capable) {
+6
-2
drivers/platform/x86/sony-laptop.c
+6
-2
drivers/platform/x86/sony-laptop.c
···
2440
2440
if (pos < 0)
2441
2441
return pos;
2442
2442
2443
-
return snprintf(buffer, PAGE_SIZE, "%s\n", pos ? "speed" : "stamina");
2443
+
return snprintf(buffer, PAGE_SIZE, "%s\n",
2444
+
pos == SPEED ? "speed" :
2445
+
pos == STAMINA ? "stamina" :
2446
+
pos == AUTO ? "auto" : "unknown");
2444
2447
}
2445
2448
2446
2449
static int sony_nc_gfx_switch_setup(struct platform_device *pd,
···
4323
4320
goto err_free_resources;
4324
4321
}
4325
4322
4326
-
if (sonypi_compat_init())
4323
+
result = sonypi_compat_init();
4324
+
if (result)
4327
4325
goto err_remove_input;
4328
4326
4329
4327
/* request io port */