diff for duplicates of <4FA369D2.1070809@ti.com> diff --git a/a/1.txt b/N1/1.txt index 7c4f29c..063feae 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -67,13 +67,14 @@ Archit > oh_count = ARRAY_SIZE(omap4_dss_hwmod_data); > } > -> - if (board_data->dsi_enable_pads = NULL) +> - if (board_data->dsi_enable_pads == NULL) > - board_data->dsi_enable_pads = omap_dsi_enable_pads; -> - if (board_data->dsi_disable_pads = NULL) +> - if (board_data->dsi_disable_pads == NULL) > - board_data->dsi_disable_pads = omap_dsi_disable_pads; > - > - pdata.board_data = board_data; -> - pdata.board_data->get_context_loss_count > - omap_pm_get_dev_context_loss_count; +> - pdata.board_data->get_context_loss_count = +> - omap_pm_get_dev_context_loss_count; > - pdata.board_data->set_min_bus_tput = omap_dss_set_min_bus_tput; > - > for (i = 0; i< oh_count; i++) { @@ -194,7 +195,7 @@ Archit > - ctx = dispc_get_ctx_loss_count(); > + ctx = dss_get_ctx_loss_count(&dispc.pdev->dev); > -> if (ctx>= 0&& ctx = dispc.ctx_loss_cnt) +> if (ctx>= 0&& ctx == dispc.ctx_loss_cnt) > return; > diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c > index f6ecc3a..a5a8316 100644 diff --git a/a/content_digest b/N1/content_digest index 78d0981..4d32b11 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01336053481-25433-9-git-send-email-tomi.valkeinen@ti.com\0" "From\0Archit Taneja <a0393947@ti.com>\0" "Subject\0Re: [PATCH 08/25] OMAPDSS: clean up the omapdss platform data mess\0" - "Date\0Fri, 04 May 2012 05:44:02 +0000\0" + "Date\0Fri, 4 May 2012 11:02:02 +0530\0" "To\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0" "Cc\0linux-omap@vger.kernel.org" " linux-fbdev@vger.kernel.org\0" @@ -77,13 +77,14 @@ "> \t\toh_count = ARRAY_SIZE(omap4_dss_hwmod_data);\n" "> \t}\n" ">\n" - "> -\tif (board_data->dsi_enable_pads = NULL)\n" + "> -\tif (board_data->dsi_enable_pads == NULL)\n" "> -\t\tboard_data->dsi_enable_pads = omap_dsi_enable_pads;\n" - "> -\tif (board_data->dsi_disable_pads = NULL)\n" + "> -\tif (board_data->dsi_disable_pads == NULL)\n" "> -\t\tboard_data->dsi_disable_pads = omap_dsi_disable_pads;\n" "> -\n" "> -\tpdata.board_data = board_data;\n" - "> -\tpdata.board_data->get_context_loss_count > -\t\tomap_pm_get_dev_context_loss_count;\n" + "> -\tpdata.board_data->get_context_loss_count =\n" + "> -\t\tomap_pm_get_dev_context_loss_count;\n" "> -\tpdata.board_data->set_min_bus_tput = omap_dss_set_min_bus_tput;\n" "> -\n" "> \tfor (i = 0; i< oh_count; i++) {\n" @@ -204,7 +205,7 @@ "> -\tctx = dispc_get_ctx_loss_count();\n" "> +\tctx = dss_get_ctx_loss_count(&dispc.pdev->dev);\n" ">\n" - "> \tif (ctx>= 0&& ctx = dispc.ctx_loss_cnt)\n" + "> \tif (ctx>= 0&& ctx == dispc.ctx_loss_cnt)\n" "> \t\treturn;\n" "> diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c\n" "> index f6ecc3a..a5a8316 100644\n" @@ -325,4 +326,4 @@ "> \t/* Unit: pixels */\n" "> \tu16 x_res;" -5d41ef31ed94ee1ea70376455460fb1cc7773d926c0d6144790feecc18735c69 +c26e88d63e2b1c046aa1695a73ba9447bfc03cb685400bae97e5a09d989c7289
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.