summaryrefslogtreecommitdiffstats
path: root/net/caif
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-09 18:38:27 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-10 16:13:31 -0400
commit566f26aa705609d05940289036ab914c8a3be707 (patch)
treefd0e25a88a89efa8b881ee57efcd1c9d8b92881a /net/caif
parent2120c52da6fe741454a60644018ad2a6abd957ac (diff)
downloadlinux-566f26aa705609d05940289036ab914c8a3be707.tar.gz
linux-566f26aa705609d05940289036ab914c8a3be707.tar.bz2
linux-566f26aa705609d05940289036ab914c8a3be707.zip
caif: move the dereference below the NULL test
The dereference should be moved below the NULL test. spatch with a semantic match is used to found this. (http://coccinelle.lip6.fr/) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
-rw-r--r--net/caif/cfsrvl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c
index dd485f6128e8..ba217e90765e 100644
--- a/net/caif/cfsrvl.c
+++ b/net/caif/cfsrvl.c
@@ -211,9 +211,10 @@ void caif_client_register_refcnt(struct cflayer *adapt_layer,
void (*put)(struct cflayer *lyr))
{
struct cfsrvl *service;
- service = container_of(adapt_layer->dn, struct cfsrvl, layer);
- WARN_ON(adapt_layer == NULL || adapt_layer->dn == NULL);
+ if (WARN_ON(adapt_layer == NULL || adapt_layer->dn == NULL))
+ return;
+ service = container_of(adapt_layer->dn, struct cfsrvl, layer);
service->hold = hold;
service->put = put;
}