diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
| commit | ca19e77e44985b5500f5461f7d2f4ce799cb60ce (patch) | |
| tree | 3ba3635ac2f212b332198b14cc3239195c153e67 /net/sched/em_text.c | |
| parent | 9d57883f08d3c0c111b50bf185dfee9731a12c76 (diff) | |
| parent | ac70eb1305d5a81efd1e32327d7e79be15a63a5a (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'net/sched/em_text.c')
| -rw-r--r-- | net/sched/em_text.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/em_text.c b/net/sched/em_text.c index 763253257411..ea8f566e720c 100644 --- a/net/sched/em_text.c +++ b/net/sched/em_text.c | |||
| @@ -103,7 +103,8 @@ retry: | |||
| 103 | 103 | ||
| 104 | static void em_text_destroy(struct tcf_proto *tp, struct tcf_ematch *m) | 104 | static void em_text_destroy(struct tcf_proto *tp, struct tcf_ematch *m) |
| 105 | { | 105 | { |
| 106 | textsearch_destroy(EM_TEXT_PRIV(m)->config); | 106 | if (EM_TEXT_PRIV(m) && EM_TEXT_PRIV(m)->config) |
| 107 | textsearch_destroy(EM_TEXT_PRIV(m)->config); | ||
| 107 | } | 108 | } |
| 108 | 109 | ||
| 109 | static int em_text_dump(struct sk_buff *skb, struct tcf_ematch *m) | 110 | static int em_text_dump(struct sk_buff *skb, struct tcf_ematch *m) |