Merge tag 'linux-kselftest-next-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kerne...

[J-linux.git] / drivers / platform / surface / surface3-wmi.c

diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
index 130b6f52a6001b217df887034c0428e9ce7f8d77..fcd1d4fb94d50e13f57cdd58d8966c1d498e8b2b 100644 (file)
--- a/drivers/platform/surface/surface3-wmi.c
+++ b/drivers/platform/surface/surface3-wmi.c
@@ -57,12 +57,16 @@ static DEFINE_MUTEX(s3_wmi_lock);
 static int s3_wmi_query_block(const char *guid, int instance, int *ret)
 {
        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
+       union acpi_object *obj = NULL;
        acpi_status status;
-       union acpi_object *obj;
        int error = 0;
 
        mutex_lock(&s3_wmi_lock);
        status = wmi_query_block(guid, instance, &output);
+       if (ACPI_FAILURE(status)) {
+               error = -EIO;
+               goto out_free_unlock;
+       }
 
        obj = output.pointer;