From 4fdec6ad1cdfa6559c1e1ba868d92a02f9f1e6ae Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Tue, 31 May 2016 12:56:23 +0200 Subject: [PATCH] staging: ks7010: make loading config file optional 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ks7010/ks7010_config.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/ks7010/ks7010_config.c b/drivers/staging/ks7010/ks7010_config.c index 7f273dafaf35..06ff8852e17f 100644 --- a/drivers/staging/ks7010/ks7010_config.c +++ b/drivers/staging/ks7010/ks7010_config.c @@ -203,7 +203,6 @@ int ks_wlan_read_config_file(ks_wlan_private *priv) const struct firmware *fw_entry; struct device *dev = NULL; - int retval; char cfg_file[]=CFG_FILE; char *cur_p, *end_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; dev = &priv->ks_wlan_hw.sdio_card->func->dev; - if((retval = request_firmware(&fw_entry, cfg_file, dev)) !=0 ){ - DPRINTK(1, "error request_firmware() file=%s ret=%d\n", cfg_file, retval); - return 1; - } + /* If no cfg file, stay with the defaults */ + if (request_firmware_direct(&fw_entry, cfg_file, dev)) + return 0; DPRINTK(4, "success request_firmware() file=%s size=%d\n", cfg_file, fw_entry->size); cur_p = fw_entry->data; -- 2.39.5