diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-13 06:48:07 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-13 06:48:07 (GMT) |
| commit | 6214b54cbf0778804de1297444c7661e70bc4d74 (patch) | |
| tree | 262a96d1be839a30e6e8d3f3452806b7f337148c /drivers/input/evdev.c | |
| parent | 05193639ca977cc889668718adb38db6d585045b (diff) | |
| parent | ba027da8eb309252cb611f23808da51487f68e12 (diff) | |
| download | linux-fsl-qoriq-6214b54cbf0778804de1297444c7661e70bc4d74.tar.xz | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A few small fixes plus a large but simple change for WM5102 which writes
out a bunch of register updates to the device when we enable the clock
as recommended following chip evaluation.
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 6ae2ac4..f0f8928 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -292,7 +292,6 @@ static int evdev_release(struct inode *inode, struct file *file) kfree(client); evdev_close_device(evdev); - put_device(&evdev->dev); return 0; } @@ -331,7 +330,6 @@ static int evdev_open(struct inode *inode, struct file *file) file->private_data = client; nonseekable_open(inode, file); - get_device(&evdev->dev); return 0; err_free_client: @@ -1001,6 +999,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev, goto err_free_evdev; cdev_init(&evdev->cdev, &evdev_fops); + evdev->cdev.kobj.parent = &evdev->dev.kobj; error = cdev_add(&evdev->cdev, evdev->dev.devt, 1); if (error) goto err_unregister_handle; |