summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-09-21 10:13:56 +0300
committerJohn W. Linville <linville@tuxdriver.com>2011-09-21 16:19:44 -0400
commit49753128d8fc976576c497c81962cf1ae57174aa (patch)
treeec6b2dd4e2ef4ec7cf2421f9989bfba240605c3a
parentaef0ba54ecb961ae559106540f37ab734b64410d (diff)
downloadlinux-3.10-49753128d8fc976576c497c81962cf1ae57174aa.tar.gz
linux-3.10-49753128d8fc976576c497c81962cf1ae57174aa.tar.bz2
linux-3.10-49753128d8fc976576c497c81962cf1ae57174aa.zip
mwifiex: remove unneeded NULL check
We dereference "rate" on the lines before so the checks here are too late to help. This function is only called from mwifiex_dump_station_info() and "rate" is always a non-NULL pointer so the check can be removed. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mwifiex/sta_ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 215c65ae23e..1df5ef6b495 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -868,10 +868,10 @@ int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,
ret = mwifiex_rate_ioctl_cfg(priv, rate);
if (!ret) {
- if (rate && rate->is_rate_auto)
+ if (rate->is_rate_auto)
rate->rate = mwifiex_index_to_data_rate(priv->tx_rate,
priv->tx_htinfo);
- else if (rate)
+ else
rate->rate = priv->data_rate;
} else {
ret = -1;