diff options
| author | Paul Moore <pmoore@redhat.com> | 2014-01-23 21:52:06 +0100 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-01-23 21:52:06 +0100 |
| commit | 41be702a542a0d14bb0b1c16e824fa9ed27616ec (patch) | |
| tree | e48942a05882da47544e179c6a0c920e00137a6a /drivers/input/misc/rb532_button.c | |
| parent | SELinux: Fix memory leak upon loading policy (diff) | |
| parent | Linux 3.13 (diff) | |
| download | linux-41be702a542a0d14bb0b1c16e824fa9ed27616ec.tar.xz linux-41be702a542a0d14bb0b1c16e824fa9ed27616ec.zip | |
Merge tag 'v3.13' into next
Linux 3.13
Minor fixup needed in selinux_inet_conn_request()
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'drivers/input/misc/rb532_button.c')
| -rw-r--r-- | drivers/input/misc/rb532_button.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/rb532_button.c b/drivers/input/misc/rb532_button.c index fb4f8ac3343b..83fff38b86b3 100644 --- a/drivers/input/misc/rb532_button.c +++ b/drivers/input/misc/rb532_button.c @@ -87,7 +87,6 @@ static int rb532_button_remove(struct platform_device *pdev) input_unregister_polled_device(poll_dev); input_free_polled_device(poll_dev); - dev_set_drvdata(&pdev->dev, NULL); return 0; } |