2 files changed, 1 insertions, 1 deletions

diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
index 1ad49946d7fa..7aee76af7a85 100644
--- a/drivers/media/pci/cx23885/cx23885-core.c
+++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -825,6 +825,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         int i;
 
         spin_lock_init(&dev->pci_irqmask_lock);
+        spin_lock_init(&dev->slock);
 
         mutex_init(&dev->lock);
         mutex_init(&dev->gpio_lock);
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index 5e93c682a3f5..2232b389c441 100644
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -1137,7 +1137,6 @@ int cx23885_video_register(struct cx23885_dev *dev)
         int err;
 
         dprintk(1, "%s()\n", __func__);
-        spin_lock_init(&dev->slock);
 
         /* Initialize VBI template */
         cx23885_vbi_template = cx23885_video_template;