git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/azt3328' into for-linus
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath
/
ar9170
/
usb.c
diff --git
a/drivers/net/wireless/ath/ar9170/usb.c
b/drivers/net/wireless/ath/ar9170/usb.c
index
754b1f8
..
007eb85
100644
(file)
--- a/
drivers/net/wireless/ath/ar9170/usb.c
+++ b/
drivers/net/wireless/ath/ar9170/usb.c
@@
-598,11
+598,15
@@
static int ar9170_usb_request_firmware(struct ar9170_usb *aru)
err = request_firmware(&aru->init_values, "ar9170-1.fw",
&aru->udev->dev);
err = request_firmware(&aru->init_values, "ar9170-1.fw",
&aru->udev->dev);
+ if (err) {
+ dev_err(&aru->udev->dev, "file with init values not found.\n");
+ return err;
+ }
err = request_firmware(&aru->firmware, "ar9170-2.fw", &aru->udev->dev);
if (err) {
release_firmware(aru->init_values);
err = request_firmware(&aru->firmware, "ar9170-2.fw", &aru->udev->dev);
if (err) {
release_firmware(aru->init_values);
- dev_err(&aru->udev->dev, "fi
le with init values
not found.\n");
+ dev_err(&aru->udev->dev, "fi
rmware file
not found.\n");
return err;
}
return err;
}