summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2014-01-12 17:24:23 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-14 17:31:49 +0100
commit25dd1652331644701a90462782ece6d0d3edf7d0 (patch)
tree56336fc76ba2b78aba806e1bbaae14a7598f3044 /drivers/media/usb
parent[media] em28xx: move v4l2_device_disconnect() call from the core to the v4l e... (diff)
downloadlinux-25dd1652331644701a90462782ece6d0d3edf7d0.tar.xz
linux-25dd1652331644701a90462782ece6d0d3edf7d0.zip
[media] em28xx: move v4l2 dummy clock deregistration from the core to the v4l extension
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r--drivers/media/usb/em28xx/em28xx-cards.c3
-rw-r--r--drivers/media/usb/em28xx/em28xx-video.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 2f520a540700..fa35a308ad67 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -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);
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index f5f716e2c5e6..32b438528fdf 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -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");