Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] em28xx: move v4l2 dummy clock deregistration from the core to the v4l extension

Browse Source 
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Frank Schaefer 2014-01-12 13:24:23 -03:00 committed by Mauro Carvalho Chehab
parent 5ad10de6ff
commit 25dd165233
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/usb/em28xx/em28xx-cards.c
View File

@ -36,7 +36,6 @@
#include <media/tvaudio.h>
#include <media/i2c-addr.h>
#include <media/tveeprom.h>
#include <media/v4l2-clk.h>
#include <media/v4l2-common.h>
#include "em28xx.h"
@ -2880,8 +2879,6 @@ void em28xx_release_resources(struct em28xx *dev)
if (dev->def_i2c_bus)
em28xx_i2c_unregister(dev, 1);
em28xx_i2c_unregister(dev, 0);
if (dev->clk)
v4l2_clk_unregister_fixed(dev->clk);
usb_put_dev(dev->udev);

6
drivers/media/usb/em28xx/em28xx-video.c
View File

@ -42,6 +42,7 @@
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-event.h>
#include <media/v4l2-clk.h>
#include <media/msp3400.h>
#include <media/tuner.h>
@ -1923,6 +1924,11 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
dev->vdev = NULL;
}
if (dev->clk) {
v4l2_clk_unregister_fixed(dev->clk);
dev->clk = NULL;
}
if (dev->users)
em28xx_warn("Device is open ! Deregistration and memory deallocation are deferred on close.\n");