From 6e3d5d756805984f9ee11919b3c4ec06ad8c6b2c Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Tue, 5 Jun 2007 12:56:53 -0700 Subject: [PATCH] --- yaml --- r: 57435 b: refs/heads/master c: c764c9ade6d9b710bad2b9c631ede9864333b98c h: refs/heads/master i: 57433: c06a11082779ab329042f17e591ff720ff9f2518 57431: 86ea2494db3585c22b9b0181571d6f0d55ba35fe v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_amanda.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 98e693019529..cb636d27e6fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c1b52bc7a2f5ee01ea3fc248a8748a1c6843f7c +refs/heads/master: c764c9ade6d9b710bad2b9c631ede9864333b98c diff --git a/trunk/net/netfilter/nf_conntrack_amanda.c b/trunk/net/netfilter/nf_conntrack_amanda.c index b8869eab7650..0568f2e86b59 100644 --- a/trunk/net/netfilter/nf_conntrack_amanda.c +++ b/trunk/net/netfilter/nf_conntrack_amanda.c @@ -208,13 +208,14 @@ static int __init nf_conntrack_amanda_init(void) { int ret, i; - ret = -ENOMEM; for (i = 0; i < ARRAY_SIZE(search); i++) { search[i].ts = textsearch_prepare(ts_algo, search[i].string, search[i].len, GFP_KERNEL, TS_AUTOLOAD); - if (search[i].ts == NULL) + if (IS_ERR(search[i].ts)) { + ret = PTR_ERR(search[i].ts); goto err1; + } } ret = nf_conntrack_helper_register(&amanda_helper[0]); if (ret < 0) @@ -227,10 +228,9 @@ static int __init nf_conntrack_amanda_init(void) err2: nf_conntrack_helper_unregister(&amanda_helper[0]); err1: - for (; i >= 0; i--) { - if (search[i].ts) - textsearch_destroy(search[i].ts); - } + while (--i >= 0) + textsearch_destroy(search[i].ts); + return ret; }