diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-03-08 09:21:13 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-03-09 10:06:11 -0800 |
| commit | a227954756de74d8e70d70135e405d69dea4e3fe (patch) | |
| tree | 456d4200a20d68cde64f10f996cafdae6c2c4217 /drivers/input/misc | |
| parent | Merge branch 'ib/4.10-sparse-keymap-managed' into next (diff) | |
| download | linux-dev-a227954756de74d8e70d70135e405d69dea4e3fe.tar.xz linux-dev-a227954756de74d8e70d70135e405d69dea4e3fe.zip | |
Input: dm355evm_keys - remove use of sparse_keymap_free
Now that sparse keymap uses managed memory, we no longer need to clean it
up manually.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/dm355evm_keys.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c index 82e272ebc0ed..5db493dfe509 100644 --- a/drivers/input/misc/dm355evm_keys.c +++ b/drivers/input/misc/dm355evm_keys.c @@ -213,21 +213,19 @@ static int dm355evm_keys_probe(struct platform_device *pdev) IRQF_TRIGGER_FALLING | IRQF_ONESHOT, dev_name(&pdev->dev), keys); if (status < 0) - goto fail2; + goto fail1; /* register */ status = input_register_device(input); if (status < 0) - goto fail3; + goto fail2; platform_set_drvdata(pdev, keys); return 0; -fail3: - free_irq(keys->irq, keys); fail2: - sparse_keymap_free(input); + free_irq(keys->irq, keys); fail1: input_free_device(input); kfree(keys); @@ -241,7 +239,6 @@ static int dm355evm_keys_remove(struct platform_device *pdev) struct dm355evm_keys *keys = platform_get_drvdata(pdev); free_irq(keys->irq, keys); - sparse_keymap_free(keys->input); input_unregister_device(keys->input); kfree(keys); |