diff for duplicates of <4C342127.9000900@samsung.com> diff --git a/a/1.txt b/N1/1.txt index 25f5cd9..36266a3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -156,7 +156,7 @@ index 9682ecc..28d34ef 100644 + + reg = readl(regs + TRIGCON); + -+ return (((reg & SWFRSTATUS_I80) = SWFRSTATUS_I80) ? 1 : 0); ++ return (((reg & SWFRSTATUS_I80) == SWFRSTATUS_I80) ? 1 : 0); +} + +/** @@ -170,7 +170,7 @@ index 9682ecc..28d34ef 100644 + void __iomem *regs = sfb->regs; + u32 reg = 0; + -+ if (sfb->pdata->interface_mode = FIMD_VIDEO_MODE) { ++ if (sfb->pdata->interface_mode == FIMD_VIDEO_MODE) { + reg = VIDTCON0_VBPD(var->upper_margin - 1) | + VIDTCON0_VFPD(var->lower_margin - 1) | + VIDTCON0_VSPW(var->vsync_len - 1); @@ -182,7 +182,7 @@ index 9682ecc..28d34ef 100644 + VIDTCON1_HSPW(var->hsync_len - 1); + + writel(reg, regs + VIDTCON1); -+ } else if (sfb->pdata->interface_mode = FIMD_COMMAND_MODE) { ++ } else if (sfb->pdata->interface_mode == FIMD_COMMAND_MODE) { + reg = LCD_CS_SETUP(windata->cmd_mode.cs_setup) | + LCD_WR_SETUP(windata->cmd_mode.wr_setup) | + LCD_WR_ACT(windata->cmd_mode.wr_act) | @@ -233,18 +233,18 @@ index 9682ecc..28d34ef 100644 windata = sfb->pdata->win[win_no]; - initmode = &windata->win_mode; - WARN_ON(windata->max_bpp = 0); -- WARN_ON(windata->win_mode.xres = 0); -- WARN_ON(windata->win_mode.yres = 0); + WARN_ON(windata->max_bpp == 0); +- WARN_ON(windata->win_mode.xres == 0); +- WARN_ON(windata->win_mode.yres == 0); + -+ if (sfb->pdata->interface_mode = FIMD_VIDEO_MODE) { -+ WARN_ON(windata->win_mode.xres = 0); -+ WARN_ON(windata->win_mode.yres = 0); ++ if (sfb->pdata->interface_mode == FIMD_VIDEO_MODE) { ++ WARN_ON(windata->win_mode.xres == 0); ++ WARN_ON(windata->win_mode.yres == 0); + + videomode = &windata->win_mode; + } else { -+ WARN_ON(windata->cmd_mode.xres = 0); -+ WARN_ON(windata->cmd_mode.yres = 0); ++ WARN_ON(windata->cmd_mode.xres == 0); ++ WARN_ON(windata->cmd_mode.yres == 0); + + cmdmode = &windata->cmd_mode; + } @@ -260,7 +260,7 @@ index 9682ecc..28d34ef 100644 - dev_err(sfb->dev, "failed to allocate display memory\n"); - return ret; + /* setup the initial video or cpu mode from the window */ -+ if (sfb->pdata->interface_mode = FIMD_VIDEO_MODE) ++ if (sfb->pdata->interface_mode == FIMD_VIDEO_MODE) + fb_videomode_to_var(&fbinfo->var, videomode); + else { + var->xres = cmdmode->xres; diff --git a/a/content_digest b/N1/content_digest index 38971e2..e5248a9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\04C341FFD.6010405@samsung.com\0" - "From\0InKi Dae <inki.dae@samsung.com>\0" + "From\0inki.dae@samsung.com (InKi Dae)\0" "Subject\0[PATCH v2 1/2] S5PV210: FB: Add MIPI-DSI and CPU Interface features.\0" - "Date\0Wed, 07 Jul 2010 06:39:35 +0000\0" + "Date\0Wed, 07 Jul 2010 15:39:35 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -163,7 +163,7 @@ "+\n" "+\treg = readl(regs + TRIGCON);\n" "+\n" - "+\treturn (((reg & SWFRSTATUS_I80) = SWFRSTATUS_I80) ? 1 : 0);\n" + "+\treturn (((reg & SWFRSTATUS_I80) == SWFRSTATUS_I80) ? 1 : 0);\n" "+}\n" "+\n" "+/**\n" @@ -177,7 +177,7 @@ "+\tvoid __iomem *regs = sfb->regs;\n" "+\tu32 reg = 0;\n" "+\n" - "+\tif (sfb->pdata->interface_mode = FIMD_VIDEO_MODE) {\n" + "+\tif (sfb->pdata->interface_mode == FIMD_VIDEO_MODE) {\n" "+\t\treg = VIDTCON0_VBPD(var->upper_margin - 1) |\n" "+\t\t VIDTCON0_VFPD(var->lower_margin - 1) |\n" "+\t\t VIDTCON0_VSPW(var->vsync_len - 1);\n" @@ -189,7 +189,7 @@ "+\t\t VIDTCON1_HSPW(var->hsync_len - 1);\n" "+\n" "+\t\twritel(reg, regs + VIDTCON1);\n" - "+\t} else if (sfb->pdata->interface_mode = FIMD_COMMAND_MODE) {\n" + "+\t} else if (sfb->pdata->interface_mode == FIMD_COMMAND_MODE) {\n" "+\t\treg = LCD_CS_SETUP(windata->cmd_mode.cs_setup) |\n" "+\t\t\tLCD_WR_SETUP(windata->cmd_mode.wr_setup) |\n" "+\t\t\tLCD_WR_ACT(windata->cmd_mode.wr_act) |\n" @@ -240,18 +240,18 @@ " \twindata = sfb->pdata->win[win_no];\n" "-\tinitmode = &windata->win_mode;\n" " \n" - " \tWARN_ON(windata->max_bpp = 0);\n" - "-\tWARN_ON(windata->win_mode.xres = 0);\n" - "-\tWARN_ON(windata->win_mode.yres = 0);\n" + " \tWARN_ON(windata->max_bpp == 0);\n" + "-\tWARN_ON(windata->win_mode.xres == 0);\n" + "-\tWARN_ON(windata->win_mode.yres == 0);\n" "+\n" - "+\tif (sfb->pdata->interface_mode = FIMD_VIDEO_MODE) {\n" - "+\t\tWARN_ON(windata->win_mode.xres = 0);\n" - "+\t\tWARN_ON(windata->win_mode.yres = 0);\n" + "+\tif (sfb->pdata->interface_mode == FIMD_VIDEO_MODE) {\n" + "+\t\tWARN_ON(windata->win_mode.xres == 0);\n" + "+\t\tWARN_ON(windata->win_mode.yres == 0);\n" "+\n" "+\t\tvideomode = &windata->win_mode;\n" "+\t} else {\n" - "+\t\tWARN_ON(windata->cmd_mode.xres = 0);\n" - "+\t\tWARN_ON(windata->cmd_mode.yres = 0);\n" + "+\t\tWARN_ON(windata->cmd_mode.xres == 0);\n" + "+\t\tWARN_ON(windata->cmd_mode.yres == 0);\n" "+\n" "+\t\tcmdmode = &windata->cmd_mode;\n" "+\t}\n" @@ -267,7 +267,7 @@ "-\t\tdev_err(sfb->dev, \"failed to allocate display memory\\n\");\n" "-\t\treturn ret;\n" "+\t/* setup the initial video or cpu mode from the window */\n" - "+\tif (sfb->pdata->interface_mode = FIMD_VIDEO_MODE)\n" + "+\tif (sfb->pdata->interface_mode == FIMD_VIDEO_MODE)\n" "+\t\tfb_videomode_to_var(&fbinfo->var, videomode);\n" "+\telse {\n" "+\t\tvar->xres = cmdmode->xres;\n" @@ -305,4 +305,4 @@ " \n" " \tret = s3c_fb_check_var(&fbinfo->var, fbinfo);" -1b6187236541c5e969a32f2ce5e2cd138756eae87749df13e8fab02bffb2ae56 +7e49cbdf8b8910ef187720e4f4dc46981c88c7aec52623e13b9c1c07fa6906c5
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.