diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-16 04:34:41 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-16 04:34:41 +0300 |
| commit | 38f1cff0863809587b5fd10ecd0c24c8b543a48c (patch) | |
| tree | 7cf6eb88cdc938c3683209d38311e711a1119400 /drivers/media/video/mem2mem_testdev.c | |
| parent | 4819d2e4310796c4e9eef674499af9b9caf36b5a (diff) | |
| parent | 5359533801e3dd3abca5b7d3d985b0b33fd9fe8b (diff) | |
| download | linux-38f1cff0863809587b5fd10ecd0c24c8b543a48c.tar.xz | |
Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next
This commit changed an internal radeon structure, that meant a new driver
in -next had to be fixed up, merge in the commit and fix up the driver.
Also fixes a trivial nouveau merge.
Conflicts:
drivers/gpu/drm/nouveau/nouveau_mem.c
Diffstat (limited to 'drivers/media/video/mem2mem_testdev.c')
| -rw-r--r-- | drivers/media/video/mem2mem_testdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c index c179041d91f8..e7e717800ee2 100644 --- a/drivers/media/video/mem2mem_testdev.c +++ b/drivers/media/video/mem2mem_testdev.c @@ -1011,7 +1011,6 @@ static int m2mtest_remove(struct platform_device *pdev) v4l2_m2m_release(dev->m2m_dev); del_timer_sync(&dev->timer); video_unregister_device(dev->vfd); - video_device_release(dev->vfd); v4l2_device_unregister(&dev->v4l2_dev); kfree(dev); |