Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[mv-sheeva.git] / drivers / input / ff-core.c

diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c
index 38df81fcdc3a90bdb4f812a02a4d064e6d657f2d..b2f07aa1604bec5de42095ab7ba4fef5c5980a7d 100644 (file)
--- a/drivers/input/ff-core.c
+++ b/drivers/input/ff-core.c
@@ -353,7 +353,7 @@ int input_ff_create(struct input_dev *dev, int max_effects)
 EXPORT_SYMBOL_GPL(input_ff_create);
 
 /**
- * input_ff_free() - frees force feedback portion of input device
+ * input_ff_destroy() - frees force feedback portion of input device
  * @dev: input device supporting force feedback
  *
  * This function is only needed in error path as input core will
@@ -369,6 +369,7 @@ void input_ff_destroy(struct input_dev *dev)
                if (ff->destroy)
                        ff->destroy(ff);
                kfree(ff->private);
+               kfree(ff->effects);
                kfree(ff);
                dev->ff = NULL;
        }