diff for duplicates of <4EDF64AF.6040008@ti.com> diff --git a/a/1.txt b/N1/1.txt index bc12f04..078a771 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,21 +35,21 @@ Archit > + u16 outw, outh; > + u16 dw, dh; > + -> + if (dssdev = NULL) +> + if (dssdev == NULL) > + return 0; > + > + dssdev->driver->get_resolution(dssdev,&dw,&dh); > + -> + if ((ovl->caps& OMAP_DSS_OVL_CAP_SCALE) = 0) { +> + if ((ovl->caps& OMAP_DSS_OVL_CAP_SCALE) == 0) { > + outw = info->width; > + outh = info->height; > + } else { -> + if (info->out_width = 0) +> + if (info->out_width == 0) > + outw = info->width; > + else > + outw = info->out_width; > + -> + if (info->out_height = 0) +> + if (info->out_height == 0) > + outh = info->height; > + else > + outh = info->out_height; @@ -83,20 +83,20 @@ Archit > + op1 = get_ovl_priv(ovl1); > + info1 = overlay_infos[ovl1->id]; > + -> + if (info1 = NULL) +> + if (info1 == NULL) > + continue; > + > + list_for_each_entry(ovl2,&mgr->overlays, list) { -> + if (ovl1 = ovl2) +> + if (ovl1 == ovl2) > + continue; > + > + op2 = get_ovl_priv(ovl2); > + info2 = overlay_infos[ovl2->id]; > + -> + if (info2 = NULL) +> + if (info2 == NULL) > + continue; > + -> + if (info1->zorder = info2->zorder) { +> + if (info1->zorder == info2->zorder) { > + DSSERR("overlays %d and %d have the same " > + "zorder %d\n", > + ovl1->id, ovl2->id, info1->zorder); @@ -128,7 +128,7 @@ Archit > + > + oi = overlay_infos[ovl->id]; > + -> + if (oi = NULL) +> + if (oi == NULL) > + continue; > + > + r = dss_ovl_check(ovl, oi, dssdev); @@ -289,7 +289,7 @@ Archit > + goto err1; > } > -> if (ovl->manager = NULL || ovl->manager->device = NULL) { +> if (ovl->manager == NULL || ovl->manager->device == NULL) { > r = -EINVAL; > - goto err; > + goto err1; diff --git a/a/content_digest b/N1/content_digest index c7c0bdb..8c84369 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01321953724-6350-64-git-send-email-tomi.valkeinen@ti.com\0" "From\0Archit Taneja <a0393947@ti.com>\0" "Subject\0Re: [PATCH 63/65] OMAPDSS: APPLY: add checking of ovls/mgrs settings\0" - "Date\0Wed, 07 Dec 2011 13:17:51 +0000\0" + "Date\0Wed, 7 Dec 2011 18:35:51 +0530\0" "To\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0" "Cc\0linux-fbdev@vger.kernel.org" linux-omap@vger.kernel.org @@ -46,21 +46,21 @@ "> +\tu16 outw, outh;\n" "> +\tu16 dw, dh;\n" "> +\n" - "> +\tif (dssdev = NULL)\n" + "> +\tif (dssdev == NULL)\n" "> +\t\treturn 0;\n" "> +\n" "> +\tdssdev->driver->get_resolution(dssdev,&dw,&dh);\n" "> +\n" - "> +\tif ((ovl->caps& OMAP_DSS_OVL_CAP_SCALE) = 0) {\n" + "> +\tif ((ovl->caps& OMAP_DSS_OVL_CAP_SCALE) == 0) {\n" "> +\t\toutw = info->width;\n" "> +\t\touth = info->height;\n" "> +\t} else {\n" - "> +\t\tif (info->out_width = 0)\n" + "> +\t\tif (info->out_width == 0)\n" "> +\t\t\toutw = info->width;\n" "> +\t\telse\n" "> +\t\t\toutw = info->out_width;\n" "> +\n" - "> +\t\tif (info->out_height = 0)\n" + "> +\t\tif (info->out_height == 0)\n" "> +\t\t\touth = info->height;\n" "> +\t\telse\n" "> +\t\t\touth = info->out_height;\n" @@ -94,20 +94,20 @@ "> +\t\top1 = get_ovl_priv(ovl1);\n" "> +\t\tinfo1 = overlay_infos[ovl1->id];\n" "> +\n" - "> +\t\tif (info1 = NULL)\n" + "> +\t\tif (info1 == NULL)\n" "> +\t\t\tcontinue;\n" "> +\n" "> +\t\tlist_for_each_entry(ovl2,&mgr->overlays, list) {\n" - "> +\t\t\tif (ovl1 = ovl2)\n" + "> +\t\t\tif (ovl1 == ovl2)\n" "> +\t\t\t\tcontinue;\n" "> +\n" "> +\t\t\top2 = get_ovl_priv(ovl2);\n" "> +\t\t\tinfo2 = overlay_infos[ovl2->id];\n" "> +\n" - "> +\t\t\tif (info2 = NULL)\n" + "> +\t\t\tif (info2 == NULL)\n" "> +\t\t\t\tcontinue;\n" "> +\n" - "> +\t\t\tif (info1->zorder = info2->zorder) {\n" + "> +\t\t\tif (info1->zorder == info2->zorder) {\n" "> +\t\t\t\tDSSERR(\"overlays %d and %d have the same \"\n" "> +\t\t\t\t\t\t\"zorder %d\\n\",\n" "> +\t\t\t\t\tovl1->id, ovl2->id, info1->zorder);\n" @@ -139,7 +139,7 @@ "> +\n" "> +\t\toi = overlay_infos[ovl->id];\n" "> +\n" - "> +\t\tif (oi = NULL)\n" + "> +\t\tif (oi == NULL)\n" "> +\t\t\tcontinue;\n" "> +\n" "> +\t\tr = dss_ovl_check(ovl, oi, dssdev);\n" @@ -300,7 +300,7 @@ "> +\t\tgoto err1;\n" "> \t}\n" ">\n" - "> \tif (ovl->manager = NULL || ovl->manager->device = NULL) {\n" + "> \tif (ovl->manager == NULL || ovl->manager->device == NULL) {\n" "> \t\tr = -EINVAL;\n" "> -\t\tgoto err;\n" "> +\t\tgoto err1;\n" @@ -332,4 +332,4 @@ "> \treturn r;\n" > } -f22d1ff8a165c45c5bc1c56a7a5b4624bae0f306e44bc56fae0d324a6be5e073 +0b24c55b075f7f09b62ff352bc8b37e818afb206d022dad4faf8f3aa913b2c2f
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.