diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 19:15:48 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 19:15:48 +0000 |
| commit | ab2f75ce55ef6f903348026271e30796f016851f (patch) | |
| tree | 8e019d460e92ee6ac2b2ea54aa0b93770bf933ef /drivers/media/video/s5p-tv | |
| parent | f56b71f5d5a3944acdcb0e5e1739574d95ddf61a (diff) | |
| parent | da5a70f3519fd6f73ece3eea261a861c9a4d6bbd (diff) | |
Merge branch 'depends/driver-core' into ux500/dt
Conflicts:
drivers/base/cpu.c
Diffstat (limited to 'drivers/media/video/s5p-tv')
| -rw-r--r-- | drivers/media/video/s5p-tv/mixer_video.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c index 7884baeff76a..f7ca5cc143c6 100644 --- a/drivers/media/video/s5p-tv/mixer_video.c +++ b/drivers/media/video/s5p-tv/mixer_video.c @@ -58,7 +58,6 @@ static struct v4l2_subdev *find_and_register_subdev( } done: - put_driver(drv); return sd; } |