diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-02-18 20:52:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-19 11:08:52 +0100 |
| commit | 24f772409b2426a6545eb0d96b297b8913d70539 (patch) | |
| tree | 179a9c0352b4020c2c469f2a1530406815c906a0 /drivers/usb/core/usb-acpi.c | |
| parent | 10892847de816edf4f8f2151174dc557c4a3f63f (diff) | |
| download | linux-stable-24f772409b2426a6545eb0d96b297b8913d70539.tar.gz linux-stable-24f772409b2426a6545eb0d96b297b8913d70539.tar.bz2 linux-stable-24f772409b2426a6545eb0d96b297b8913d70539.zip | |
usb: core: Make use of acpi_evaluate_object() status
Compiler is not happy about dangling variable:
.../core/usb-acpi.c: In function ‘usb_acpi_get_connect_type’:
.../core/usb-acpi.c:90:14: warning: variable ‘status’ set but not used [-Wunused-but-set-variable]
90 | acpi_status status;
| ^~~~~~
Make use of it by checking the status and bail out in case of error.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200218185207.62527-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/usb-acpi.c')
| -rw-r--r-- | drivers/usb/core/usb-acpi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c index 9043d7242d67..99d41dc26e08 100644 --- a/drivers/usb/core/usb-acpi.c +++ b/drivers/usb/core/usb-acpi.c @@ -86,7 +86,7 @@ static enum usb_port_connect_type usb_acpi_get_connect_type(acpi_handle handle, { enum usb_port_connect_type connect_type = USB_PORT_CONNECT_TYPE_UNKNOWN; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; - union acpi_object *upc; + union acpi_object *upc = NULL; acpi_status status; /* @@ -98,11 +98,12 @@ static enum usb_port_connect_type usb_acpi_get_connect_type(acpi_handle handle, * no connectable, the port would be not used. */ status = acpi_evaluate_object(handle, "_UPC", NULL, &buffer); + if (ACPI_FAILURE(status)) + goto out; + upc = buffer.pointer; - if (!upc || (upc->type != ACPI_TYPE_PACKAGE) - || upc->package.count != 4) { + if (!upc || (upc->type != ACPI_TYPE_PACKAGE) || upc->package.count != 4) goto out; - } if (upc->package.elements[0].integer.value) if (pld->user_visible) |