main.c (849a564b7e28db7afed18d4b921303b7bd883112) main.c (a351f2f537b711bed3d0f6a75d7e9fddcbe51ffe)
1/*
2 * Copyright (c) 2012-2017 Qualcomm Atheros, Inc.
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

--- 920 unchanged lines hidden (view full) ---

929 rc = wil_get_bl_info(wil);
930 if (rc == -EAGAIN && !load_fw) /* ignore RF error if not going up */
931 rc = 0;
932 if (rc)
933 return rc;
934
935 wil_set_oob_mode(wil, oob_mode);
936 if (load_fw) {
1/*
2 * Copyright (c) 2012-2017 Qualcomm Atheros, Inc.
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

--- 920 unchanged lines hidden (view full) ---

929 rc = wil_get_bl_info(wil);
930 if (rc == -EAGAIN && !load_fw) /* ignore RF error if not going up */
931 rc = 0;
932 if (rc)
933 return rc;
934
935 wil_set_oob_mode(wil, oob_mode);
936 if (load_fw) {
937 wil_info(wil, "Use firmware <%s> + board <%s>\n", WIL_FW_NAME,
938 WIL_FW2_NAME);
937 wil_info(wil, "Use firmware <%s> + board <%s>\n",
938 wil->wil_fw_name, WIL_BOARD_FILE_NAME);
939
940 wil_halt_cpu(wil);
941 memset(wil->fw_version, 0, sizeof(wil->fw_version));
942 /* Loading f/w from the file */
939
940 wil_halt_cpu(wil);
941 memset(wil->fw_version, 0, sizeof(wil->fw_version));
942 /* Loading f/w from the file */
943 rc = wil_request_firmware(wil, WIL_FW_NAME, true);
943 rc = wil_request_firmware(wil, wil->wil_fw_name, true);
944 if (rc)
945 return rc;
944 if (rc)
945 return rc;
946 rc = wil_request_firmware(wil, WIL_FW2_NAME, true);
946 rc = wil_request_firmware(wil, WIL_BOARD_FILE_NAME, true);
947 if (rc)
948 return rc;
949
950 /* Mark FW as loaded from host */
951 wil_s(wil, RGF_USER_USAGE_6, 1);
952
953 /* clear any interrupts which on-card-firmware
954 * may have set

--- 241 unchanged lines hidden --- 		947 if (rc)
948 return rc;
949
950 /* Mark FW as loaded from host */
951 wil_s(wil, RGF_USER_USAGE_6, 1);
952
953 /* clear any interrupts which on-card-firmware
954 * may have set

--- 241 unchanged lines hidden ---