MLK-21257-3: media: isi: fix some conflicts when do upgrade

Fix some conflicts when do kernel 4.19 upgrade

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

diff --git a/drivers/media/platform/imx8/mxc-isi-core.c b/drivers/media/platform/imx8/mxc-isi-core.c
index afa3977..007b3dc 100644 (file)
--- a/drivers/media/platform/imx8/mxc-isi-core.c
+++ b/drivers/media/platform/imx8/mxc-isi-core.c
@@ -185,8 +185,6 @@ static int mxc_isi_probe(struct platform_device *pdev)
                goto err_sclk;
        }
 
-       mxc_isi->flags = MXC_ISI_PM_POWERED;
-       mxc_isi_channel_set_chain_buf(mxc_isi);
        clk_disable_unprepare(mxc_isi->clk);
 
        pm_runtime_enable(dev);

diff --git a/drivers/media/platform/imx8/mxc-isi-core.h b/drivers/media/platform/imx8/mxc-isi-core.h
index 21e847f..7eb127f 100644 (file)
--- a/drivers/media/platform/imx8/mxc-isi-core.h
+++ b/drivers/media/platform/imx8/mxc-isi-core.h
@@ -247,13 +247,6 @@ struct mxc_isi_m2m_dev {
 
        struct list_head                out_active;
        struct mxc_isi_ctrls    ctrls;
-
-       unsigned int read_done;
-       unsigned int frame_count;
-
-       struct list_head                out_active;
-       struct mxc_isi_ctrls    ctrls;
-
        u8 alpha;
 };