1 files changed, 20 insertions, 3 deletions

diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 4e44dcda3875..da66e5f8d91d 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -441,7 +441,7 @@ static int cx23885_start_video_dma(struct cx23885_dev *dev,
         q->count = 1;
 
         /* enable irq */
-        cx_set(PCI_INT_MSK, cx_read(PCI_INT_MSK) | 0x01);
+        cx23885_irq_add_enable(dev, 0x01);
         cx_set(VID_A_INT_MSK, 0x000011);
 
         /* start dma */
@@ -1205,6 +1205,21 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
         return 0;
 }
 
+static int vidioc_log_status(struct file *file, void *priv)
+{
+        struct cx23885_fh  *fh  = priv;
+        struct cx23885_dev *dev = fh->dev;
+
+        printk(KERN_INFO
+                "%s/0: ============  START LOG STATUS  ============\n",
+               dev->name);
+        call_all(dev, core, log_status);
+        printk(KERN_INFO
+                "%s/0: =============  END LOG STATUS  =============\n",
+               dev->name);
+        return 0;
+}
+
 static int vidioc_queryctrl(struct file *file, void *priv,
                                 struct v4l2_queryctrl *qctrl)
 {
@@ -1410,6 +1425,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_enum_input    = vidioc_enum_input,
         .vidioc_g_input       = vidioc_g_input,
         .vidioc_s_input       = vidioc_s_input,
+        .vidioc_log_status    = vidioc_log_status,
         .vidioc_queryctrl     = vidioc_queryctrl,
         .vidioc_g_ctrl        = vidioc_g_ctrl,
         .vidioc_s_ctrl        = vidioc_s_ctrl,
@@ -1449,7 +1465,7 @@ static const struct v4l2_file_operations radio_fops = {
 void cx23885_video_unregister(struct cx23885_dev *dev)
 {
         dprintk(1, "%s()\n", __func__);
-        cx_clear(PCI_INT_MSK, 1);
+        cx23885_irq_remove(dev, 0x01);
 
         if (dev->video_dev) {
                 if (video_is_registered(dev->video_dev))
@@ -1486,7 +1502,8 @@ int cx23885_video_register(struct cx23885_dev *dev)
                 VID_A_DMA_CTL, 0x11, 0x00);
 
         /* Don't enable VBI yet */
-        cx_set(PCI_INT_MSK, 1);
+
+        cx23885_irq_add_enable(dev, 0x01);
 
         if (TUNER_ABSENT != dev->tuner_type) {
                 struct v4l2_subdev *sd = NULL;