summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-01-19 15:01:16 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2014-01-19 17:47:13 +0100
commit9d259696d60df46c23e88758288ce23c592e875a (patch)
treed664938339265960d14c512b1acea74c99cf96e3
parentc21d3628ea6a68f70d048294d1c2247a462e03a2 (diff)
backports: fix unused var ret warning
This fixes the following warning: /drivers/net/wireless/mwifiex/sta_cmd.c: In function ‘mwifiex_cmd_cfg_data’: /drivers/net/wireless/mwifiex/sta_cmd.c:1196:6: warning: unused variable ‘ret’ [-Wunused-variable] int ret; ^ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch10
1 files changed, 7 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch b/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch
index d3712db0..ac882e63 100644
--- a/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch
+++ b/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch
@@ -8,15 +8,19 @@
/*
* This function prepares command to set/get RSSI information.
-@@ -1194,6 +1195,7 @@ static int mwifiex_cmd_cfg_data(struct m
- int ret;
+@@ -1192,9 +1193,10 @@ static int mwifiex_cmd_cfg_data(struct m
+ struct property *prop = data_buf;
+ u32 len;
+ u8 *data = (u8 *)cmd + S_DS_GEN;
+- int ret;
if (prop) {
+#if defined(CONFIG_OF) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
++ int ret;
len = prop->length;
ret = of_property_read_u8_array(adapter->dt_node, prop->name,
data, len);
-@@ -1201,6 +1203,9 @@ static int mwifiex_cmd_cfg_data(struct m
+@@ -1202,6 +1204,9 @@ static int mwifiex_cmd_cfg_data(struct m
return ret;
dev_dbg(adapter->dev,
"download cfg_data from device tree: %s\n", prop->name);