diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-08-07 09:12:49 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-08-07 09:12:49 +0000 |
| commit | 195c4d9a3deacb973e7dc5d55f028ea9ed7c6d7d (patch) | |
| tree | 881f2e1921a80a5701421cc99477c3592962a15f /package/rt2x00/src/rt2x00firmware.c | |
| parent | ce173e209444843060cc64cc22b5c7f612a9bf54 (diff) | |
| download | mtk-20170518-195c4d9a3deacb973e7dc5d55f028ea9ed7c6d7d.zip mtk-20170518-195c4d9a3deacb973e7dc5d55f028ea9ed7c6d7d.tar.gz mtk-20170518-195c4d9a3deacb973e7dc5d55f028ea9ed7c6d7d.tar.bz2 | |
Upgrade rt2x00 to a more recent snapshot, master mode now working, thanks to Daniel Gimpelevich
SVN-Revision: 8367
Diffstat (limited to 'package/rt2x00/src/rt2x00firmware.c')
| -rw-r--r-- | package/rt2x00/src/rt2x00firmware.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/package/rt2x00/src/rt2x00firmware.c b/package/rt2x00/src/rt2x00firmware.c index 3aef107..4c1ce4c 100644 --- a/package/rt2x00/src/rt2x00firmware.c +++ b/package/rt2x00/src/rt2x00firmware.c @@ -29,10 +29,12 @@ */ #define DRV_NAME "rt2x00lib" +#include <linux/delay.h> #include <linux/crc-itu-t.h> #include <linux/firmware.h> #include "rt2x00.h" +#include "rt2x00lib.h" #include "rt2x00firmware.h" static void rt2x00lib_load_firmware_continued(const struct firmware *fw, @@ -90,12 +92,17 @@ int rt2x00lib_load_firmware(struct rt2x00_dev *rt2x00dev) * Read correct firmware from harddisk. */ fw_name = rt2x00dev->ops->lib->get_fw_name(rt2x00dev); - BUG_ON(fw_name == NULL); + if (!fw_name) { + ERROR(rt2x00dev, + "Invalid firmware filename.\n" + "Please file bug report to %s.\n", DRV_PROJECT); + return -EINVAL; + } INFO(rt2x00dev, "Loading firmware file '%s'.\n", fw_name); status = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, - fw_name, rt2x00dev->device, rt2x00dev, + fw_name, wiphy_dev(rt2x00dev->hw->wiphy), rt2x00dev, &rt2x00lib_load_firmware_continued); if (status) |