diff options
| author | Marc Dietrich <marvin24@gmx.de> | 2012-06-24 23:25:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 10:55:37 -0700 |
| commit | f5e3352e5185ef37700da9a51c333559381fe8fd (patch) | |
| tree | 18eb3873fe94122b1885f2ac6252e3a75949d241 /drivers/staging/nvec/nvec_ps2.c | |
| parent | 59d6a29e554d891a513476c13a6657825f8be270 (diff) | |
| download | op-kernel-dev-f5e3352e5185ef37700da9a51c333559381fe8fd.zip op-kernel-dev-f5e3352e5185ef37700da9a51c333559381fe8fd.tar.gz | |
staging: nvec: convert to devm_ functions
This patch cleanups the nvec and its childs by replacing calls to
resource allocations by their devm_* equivalents.
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/nvec/nvec_ps2.c')
| -rw-r--r-- | drivers/staging/nvec/nvec_ps2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c index 14a6f68..d6ceff9 100644 --- a/drivers/staging/nvec/nvec_ps2.c +++ b/drivers/staging/nvec/nvec_ps2.c @@ -96,7 +96,11 @@ static int nvec_ps2_notifier(struct notifier_block *nb, static int __devinit nvec_mouse_probe(struct platform_device *pdev) { struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); - struct serio *ser_dev = kzalloc(sizeof(struct serio), GFP_KERNEL); + struct serio *ser_dev; + + ser_dev = devm_kzalloc(&pdev->dev, sizeof(struct serio), GFP_KERNEL); + if (ser_dev == NULL) + return -ENOMEM; ser_dev->id.type = SERIO_PS_PSTHRU; ser_dev->write = ps2_sendcommand; |
