summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2014-05-09 18:10:34 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-05-13 15:56:35 -0400
commitfe5d96246e9c4d266c4a8dca99f82ad82f2305b5 (patch)
tree5bcf7c7b0afa226827bae936cc3d8fef0ca7b588 /drivers/net/wireless/orinoco
parente515e9cb6477dbd039a49c38794d8b91491339a2 (diff)
downloadop-kernel-dev-fe5d96246e9c4d266c4a8dca99f82ad82f2305b5.zip
op-kernel-dev-fe5d96246e9c4d266c4a8dca99f82ad82f2305b5.tar.gz
orinoco_usb: Fix broken firmware load error checking
The check of ezusb_firmware_download() return value (added by commit 488ec878034eccb852267b0e27ce9d511f75c587) is broken because ezusb_firmware_download() returns 1 on success. This causes the driver not to work with the following error: orinoco_usb: probe of 3-3:1.0 failed with error -14 Check the return value only for negative values. This fix should be applied to -stable kernels too. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco')
-rw-r--r--drivers/net/wireless/orinoco/orinoco_usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index f9805c9..1cbb783 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -1687,7 +1687,7 @@ static int ezusb_probe(struct usb_interface *interface,
firmware.code = fw_entry->data;
}
if (firmware.size && firmware.code) {
- if (ezusb_firmware_download(upriv, &firmware))
+ if (ezusb_firmware_download(upriv, &firmware) < 0)
goto error;
} else {
err("No firmware to download");
OpenPOWER on IntegriCloud