Commit ba9b4081 authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman

usb: ohci-da8xx: ensure error return on variable error is set

Currently when an error occurs when calling devm_gpiod_get_optional or
calling gpiod_to_irq it causes an uninitialized error return in variable
'error' to be returned.  Fix this by ensuring the error variable is set
from da8xx_ohci->oc_gpio and oc_irq.

Thanks to Dan Carpenter for spotting the uninitialized error in the
gpiod_to_irq failure case.

Addresses-Coverity: ("Uninitialized scalar variable")
Fixes: d193abf1 ("usb: ohci-da8xx: add vbus and overcurrent gpios")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Cc: stable <stable@vger.kernel.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20200107123901.101190-1-colin.king@canonical.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96a0c128
...@@ -415,13 +415,17 @@ static int ohci_da8xx_probe(struct platform_device *pdev) ...@@ -415,13 +415,17 @@ static int ohci_da8xx_probe(struct platform_device *pdev)
} }
da8xx_ohci->oc_gpio = devm_gpiod_get_optional(dev, "oc", GPIOD_IN); da8xx_ohci->oc_gpio = devm_gpiod_get_optional(dev, "oc", GPIOD_IN);
if (IS_ERR(da8xx_ohci->oc_gpio)) if (IS_ERR(da8xx_ohci->oc_gpio)) {
error = PTR_ERR(da8xx_ohci->oc_gpio);
goto err; goto err;
}
if (da8xx_ohci->oc_gpio) { if (da8xx_ohci->oc_gpio) {
oc_irq = gpiod_to_irq(da8xx_ohci->oc_gpio); oc_irq = gpiod_to_irq(da8xx_ohci->oc_gpio);
if (oc_irq < 0) if (oc_irq < 0) {
error = oc_irq;
goto err; goto err;
}
error = devm_request_threaded_irq(dev, oc_irq, NULL, error = devm_request_threaded_irq(dev, oc_irq, NULL,
ohci_da8xx_oc_thread, IRQF_TRIGGER_RISING | ohci_da8xx_oc_thread, IRQF_TRIGGER_RISING |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment