orinoco_usb: Fix broken firmware load error checking
PATCH RESEND 1/1 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.
--- drivers/net/wireless/orinoco/orinoco_usb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/orinoco/orinoco_usb.c +1 -1
@@ -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" );
Signature · 1 line
Ondrej Zary
This is already merged in wireless-next...
commit fe5d96246e9c4d266c4a8dca99f82ad82f2305b5
Author: Ondrej Zary <[email protected]> Date: Fri May 9 18:10:34 2014 +0200
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.
Quoted 31 lines · Ondrej Zary
The check of
ezusb_firmware_download()return value (added by commit488ec878034eccb852267b0e27ce9d511f75c587) is broken becauseezusb_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 -14Check the return value only for negative values.
This fix should be applied to -stable kernels too.
Signed-off-by Ondrej Zary <[email protected]>--- drivers/net/wireless/orinoco/orinoco_usb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/net/wireless/orinoco/orinoco_usb.c +1
-1@@ -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" );Signature · 1 line
Ondrej Zary
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.