From 9d259696d60df46c23e88758288ce23c592e875a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 19 Jan 2014 15:01:16 +0100 Subject: [PATCH] backports: fix unused var ret warning MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- .../network/82-struct_property_missing/mwifiex.patch | 10 +++++++--- 1 file 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 d3712db03236..ac882e63cd70 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); -- 2.30.2