diff options
| author | Christian Lamparter | 2009-08-08 17:09:48 +0200 |
|---|---|---|
| committer | John W. Linville | 2009-08-10 22:41:01 +0200 |
| commit | 363ec5614f86110c6a6bdd72ac2147ebafd3ff5e (patch) | |
| tree | 802d4baba3e5d85f66fdfe182701c3c6cdcb5f40 /drivers | |
| parent | mlx4_en: Fix read buffer overflow in mlx4_en_complete_rx_desc() (diff) | |
| download | kernel-qcow2-linux-363ec5614f86110c6a6bdd72ac2147ebafd3ff5e.tar.gz kernel-qcow2-linux-363ec5614f86110c6a6bdd72ac2147ebafd3ff5e.tar.xz kernel-qcow2-linux-363ec5614f86110c6a6bdd72ac2147ebafd3ff5e.zip | |
ar9170usb: fix spurious firmware related message
When ar9170-2.fw was missing, the driver erroneously complained
about missing the initialization values file ar9170-1.fw...
Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ar9170/usb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c index 754b1f8d8da9..007eb85fc67e 100644 --- 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); + 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); - dev_err(&aru->udev->dev, "file with init values not found.\n"); + dev_err(&aru->udev->dev, "firmware file not found.\n"); return err; } |