]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: nvec: remove managed resource from PS2 driver
authorMarc Dietrich <marvin24@gmx.de>
Tue, 1 Nov 2016 12:59:40 +0000 (13:59 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Nov 2016 10:48:25 +0000 (11:48 +0100)
This basicly reverts commit e534f3e9 (staging:nvec: Introduce the use of
the managed version of kzalloc). Serio struct should never by managed
because it is refcounted. Doing so will lead to a double free oops on module
remove.

Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Fixes: e534f3e9429f ("staging:nvec: Introduce the use of the managed version of kzalloc")
Cc: stable <stable@vger.kernel.org> # 3.15+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/nvec/nvec_ps2.c

index 910e87b761e78055b822e3779b5a0126092e3c49..499952c8ef3915ba54afe52347bc220cbad1387c 100644 (file)
@@ -107,7 +107,7 @@ static int nvec_mouse_probe(struct platform_device *pdev)
        struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
        struct serio *ser_dev;
 
-       ser_dev = devm_kzalloc(&pdev->dev, sizeof(struct serio), GFP_KERNEL);
+       ser_dev = kzalloc(sizeof(struct serio), GFP_KERNEL);
        if (!ser_dev)
                return -ENOMEM;