diff for duplicates of <4F57A4E5.6070201@ti.com> diff --git a/a/1.txt b/N1/1.txt index b6b0639..1356b2e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,13 +60,14 @@ Why are the checks for board data being NULL removed here? > 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; > - > for (i = 0; i< oh_count; i++) { > oh = omap_hwmod_lookup(curr_dss_hwmod[i].oh_name); @@ -191,7 +192,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 3e656be..4e2f7ff 100644 diff --git a/a/content_digest b/N1/content_digest index 376d303..be159b7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01331124290-6285-9-git-send-email-tomi.valkeinen@ti.com\0" "From\0Archit Taneja <a0393947@ti.com>\0" "Subject\0Re: [PATCH 08/21] OMAPDSS: clean up the omapdss platform data mess\0" - "Date\0Wed, 07 Mar 2012 18:23:49 +0000\0" + "Date\0Wed, 7 Mar 2012 23:41:49 +0530\0" "To\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0" "Cc\0linux-omap@vger.kernel.org" linux-fbdev@vger.kernel.org @@ -71,13 +71,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" "> -\n" "> \tfor (i = 0; i< oh_count; i++) {\n" "> \t\toh = omap_hwmod_lookup(curr_dss_hwmod[i].oh_name);\n" @@ -202,7 +203,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 3e656be..4e2f7ff 100644\n" @@ -323,4 +324,4 @@ "> \t/* Unit: pixels */\n" "> \tu16 x_res;" -a0b795c18389a206fb103bcdae4c9339c9430cfab949b9ef169f33bfea4a290e +b74cd9d84a4dd20d9bf173b8d40f3273e655c00c3ae93fb11e1bf4aa09a50dd3
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.