On 23 March 2015 at 17:01, Kalle Valo <[email protected]> wrote: > Michal Kazior <[email protected]> writes: > >> There's no need to implement the same thing twice. >> Reduce code duplication. >> >> Signed-off-by: Michal Kazior <[email protected]> > > [...] > >> @@ -730,6 +716,12 @@ static int ath10k_core_fetch_firmware_files(struct >> ath10k *ar) >> /* calibration file is optional, don't check for any errors */ >> ath10k_fetch_cal_file(ar); >> >> + ret = ath10k_core_fetch_board_file(ar); >> + if (ret) { >> + ath10k_err(ar, "failed to fetch board file: %d\n", ret); >> + return ret; >> + } >> + >> ar->fw_api = 4; >> ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api); > > There was a conflict here, please check the resolution in the pending > branch.
Looks good, thanks! Michał -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
