Merge remote-tracking branch 'mfd/for-mfd-next'

[deliverable/linux.git] / drivers / media / platform / omap3isp / isp.c

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 5d54e2c6c16bdc4eeb0f081efc2c51421e234e29..0321d84addc776c6c5e74c4c0bbe86d1afc9c752 100644 (file)
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -657,6 +657,10 @@ static irqreturn_t isp_isr(int irq, void *_isp)
        return IRQ_HANDLED;
 }
 
+static const struct media_device_ops isp_media_ops = {
+       .link_notify = v4l2_pipeline_link_notify,
+};
+
 /* -----------------------------------------------------------------------------
  * Pipeline stream management
  */
@@ -1680,7 +1684,7 @@ static int isp_register_entities(struct isp_device *isp)
        strlcpy(isp->media_dev.model, "TI OMAP3 ISP",
                sizeof(isp->media_dev.model));
        isp->media_dev.hw_revision = isp->revision;
-       isp->media_dev.link_notify = v4l2_pipeline_link_notify;
+       isp->media_dev.ops = &isp_media_ops;
        media_device_init(&isp->media_dev);
 
        isp->v4l2_dev.mdev = &isp->media_dev;