diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 03:40:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 03:40:19 +0200 |
| commit | f35c69b736e4f910d7447346980145212c283570 (patch) | |
| tree | 824b90cd870e6de07bbba19d761c1c74cf1fb4a7 /drivers/power/wm831x_backup.c | |
| parent | uio/uio_pci_generic: Use module_pci_driver to register driver (diff) | |
| parent | Linux 3.10-rc3 (diff) | |
| download | linux-f35c69b736e4f910d7447346980145212c283570.tar.xz linux-f35c69b736e4f910d7447346980145212c283570.zip | |
Merge 3.10-rc3 into char-misc-next
We want the changes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/power/wm831x_backup.c')
| -rw-r--r-- | drivers/power/wm831x_backup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c index 58cbb009b74f..56fb509f4be0 100644 --- a/drivers/power/wm831x_backup.c +++ b/drivers/power/wm831x_backup.c @@ -207,7 +207,6 @@ static int wm831x_backup_remove(struct platform_device *pdev) struct wm831x_backup *devdata = platform_get_drvdata(pdev); power_supply_unregister(&devdata->backup); - kfree(devdata->backup.name); return 0; } |