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

[deliverable/linux.git] / drivers / staging / media / omap4iss / iss.c

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 6ceb4eb00493da8dc58ce78e4583d2d5bf95b2d7..ffc4900da9612382a03873c80e07309e372a150b 100644 (file)
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -362,6 +362,10 @@ static irqreturn_t iss_isr(int irq, void *_iss)
        return IRQ_HANDLED;
 }
 
+static const struct media_device_ops iss_media_ops = {
+       .link_notify = v4l2_pipeline_link_notify,
+};
+
 /* -----------------------------------------------------------------------------
  * Pipeline stream management
  */
@@ -988,7 +992,7 @@ static int iss_register_entities(struct iss_device *iss)
        strlcpy(iss->media_dev.model, "TI OMAP4 ISS",
                sizeof(iss->media_dev.model));
        iss->media_dev.hw_revision = iss->revision;
-       iss->media_dev.link_notify = v4l2_pipeline_link_notify;
+       iss->media_dev.ops = &iss_media_ops;
        ret = media_device_register(&iss->media_dev);
        if (ret < 0) {
                dev_err(iss->dev, "Media device registration failed (%d)\n",