diff options
author | 2019-12-23 07:00:09 -0500 | |
---|---|---|
committer | 2019-12-23 07:00:09 -0500 | |
commit | 398d999f96bf8e02573b0c7e32896c7812393bc0 (patch) | |
tree | 839f1616cc205b9a74f07f7b571a603814446de6 /drivers/platform/x86/hp-wmi.c | |
parent | staging: nvec: check return value (diff) | |
parent | Linux 5.5-rc3 (diff) | |
download | linux-dev-398d999f96bf8e02573b0c7e32896c7812393bc0.tar.xz linux-dev-398d999f96bf8e02573b0c7e32896c7812393bc0.zip |
Merge 5.5-rc3 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/x86/hp-wmi.c')
-rw-r--r-- | drivers/platform/x86/hp-wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 9579a706fc08..a881b709af25 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -300,7 +300,7 @@ static int __init hp_wmi_bios_2008_later(void) static int __init hp_wmi_bios_2009_later(void) { - int state = 0; + u8 state[128]; int ret = hp_wmi_perform_query(HPWMI_FEATURE2_QUERY, HPWMI_READ, &state, sizeof(state), sizeof(state)); if (!ret) |