diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 12:52:33 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 12:52:33 +0900 |
| commit | f1e0477a7b7a541f51eea279910eed4ddd010033 (patch) | |
| tree | 552841f13496306f0140d5faca82ae9987a81b5e /drivers/input/misc/mpu3050.c | |
| parent | b58c580d996655658975aa8042b43b7d579f3986 (diff) | |
| parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'drivers/input/misc/mpu3050.c')
| -rw-r--r-- | drivers/input/misc/mpu3050.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/mpu3050.c b/drivers/input/misc/mpu3050.c index b95fac15b2ea..f71dc728da58 100644 --- a/drivers/input/misc/mpu3050.c +++ b/drivers/input/misc/mpu3050.c @@ -282,7 +282,7 @@ err_free_irq: err_pm_set_suspended: pm_runtime_set_suspended(&client->dev); err_free_mem: - input_unregister_device(idev); + input_free_device(idev); kfree(sensor); return error; } |