Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[linux-2.6] / net / sched / ematch.c

diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index b29439ddcf717053923a38b610a8ee89cac17744..5e6f82e0e6f3ca7c092e3a1628d69b416604d0f5 100644 (file)
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -410,7 +410,7 @@ void tcf_em_tree_destroy(struct tcf_proto *tp, struct tcf_ematch_tree *tree)
                        if (em->ops->destroy)
                                em->ops->destroy(tp, em);
                        else if (!tcf_em_is_simple(em))
-                               kfree(em->data);
+                               kfree((void *) em->data);
                        module_put(em->ops->owner);
                }
        }