summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-11-07 19:31:45 -0800
committerJohn W. Linville <linville@tuxdriver.com>2011-11-09 16:14:12 -0500
commitfa161cb7aa7da29018f7378ccbab6bb593be008c (patch)
tree158bff5e6397ace8b83259dc433a00f631371f8d /drivers
parentfba6fe634787bb7ef95fb44682df71b4d4e8cb2d (diff)
downloadlwn-fa161cb7aa7da29018f7378ccbab6bb593be008c.tar.gz
lwn-fa161cb7aa7da29018f7378ccbab6bb593be008c.zip
mwifiex: remove an unneeded NULL check
We dereference adapter in the error handling code so this needed to be fixed. This function is always called like: adapter->if_ops.host_to_card(adapter, ...); so adapter can never be NULL and I've removed the NULL check. 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/mwifiex/pcie.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index 44669763c4e6..d12d44055489 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -1671,9 +1671,8 @@ static int mwifiex_pcie_host_to_card(struct mwifiex_adapter *adapter, u8 type,
struct sk_buff *skb,
struct mwifiex_tx_param *tx_param)
{
- if (!adapter || !skb) {
- dev_err(adapter->dev, "Invalid parameter in %s <%p, %p>\n",
- __func__, adapter, skb);
+ if (!skb) {
+ dev_err(adapter->dev, "Passed NULL skb to %s\n", __func__);
return -1;
}