| Message ID | 20210204113848.105994-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | platform/surface: surface3-wmi: Fix variable 'status' set but not used compiler warning | expand |
Hi, On 2/4/21 12:38 PM, Hans de Goede wrote: > Explicitly check the status rather then relying on output.pointer staying > NULL on an error. This silences the following compiler warning: > > drivers/platform/surface/surface3-wmi.c:60:14: warning: variable 'status' set but not used [-Wunused-but-set-variable] > > Reported-by: kernel test robot <lkp@intel.com> > Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> I've added this patch to my review-hans branch, so it should show up in pdx86/for-next soon-ish. Regards, Hans > --- > drivers/platform/surface/surface3-wmi.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c > index 130b6f52a600..fcd1d4fb94d5 100644 > --- 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; > >
diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c index 130b6f52a600..fcd1d4fb94d5 100644 --- 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;