Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / input / serio / ps2mult.c

diff --git a/drivers/input/serio/ps2mult.c b/drivers/input/serio/ps2mult.c
index 6bce22e4e495d64d750fbf66d6c1b011e077bc64..15aa81c9f1fb0215d1552bd36d22c5adf10d62c4 100644 (file)
--- a/drivers/input/serio/ps2mult.c
+++ b/drivers/input/serio/ps2mult.c
@@ -207,7 +207,7 @@ static int ps2mult_connect(struct serio *serio, struct serio_driver *drv)
 err_out:
        while (--i >= 0)
                kfree(psm->ports[i].serio);
-       kfree(serio);
+       kfree(psm);
        return error;
 }