AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-21 15:34:43 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: ks7010: make loading config file optional

Browse Source 
We have sane defaults, so we don't need to bail out if there is no
config file. Note that the config file should go away completely in
favour of configuration mechanisms already upstream.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Wolfram Sang 2016-05-31 12:56:23 +02:00 committed by Greg Kroah-Hartman
parent f88e6d3317
commit 4fdec6ad1c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/ks7010/ks7010_config.c
View File

@ -203,7 +203,6 @@ int ks_wlan_read_config_file(ks_wlan_private *priv)
const struct firmware *fw_entry; const struct firmware *fw_entry;
struct device *dev = NULL; struct device *dev = NULL;
int retval;
char cfg_file[]=CFG_FILE; char cfg_file[]=CFG_FILE;
char *cur_p, *end_p; char *cur_p, *end_p;
char wk_buff[256], *wk_p; char wk_buff[256], *wk_p;
@ -254,10 +253,9 @@ int ks_wlan_read_config_file(ks_wlan_private *priv)
priv->reg.rate_set.size = 12; priv->reg.rate_set.size = 12;
dev = &priv->ks_wlan_hw.sdio_card->func->dev; dev = &priv->ks_wlan_hw.sdio_card->func->dev;
if((retval = request_firmware(&fw_entry, cfg_file, dev)) !=0 ){ /* If no cfg file, stay with the defaults */
DPRINTK(1, "error request_firmware() file=%s ret=%d\n", cfg_file, retval); if (request_firmware_direct(&fw_entry, cfg_file, dev))
return 1; return 0;
}
DPRINTK(4, "success request_firmware() file=%s size=%d\n", cfg_file, fw_entry->size); DPRINTK(4, "success request_firmware() file=%s size=%d\n", cfg_file, fw_entry->size);
cur_p = fw_entry->data; cur_p = fw_entry->data;