diff for duplicates of <20100129162755.b591a2fb.akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index c850f73..05b2a89 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -190,20 +190,20 @@ Perhaps use %lld and remove the cast. > + > + /* validate x/y resolution */ > + /* choose default mode if possible */ -> + if (var->xres = default_display->xres && -> + var->yres = default_display->yres && -> + var->bits_per_pixel = default_display->bpp) +> + if (var->xres == default_display->xres && +> + var->yres == default_display->yres && +> + var->bits_per_pixel == default_display->bpp) > + display = default_display; > + else > + for (i = 0; i < mach_info->num_displays; i++) -> + if (var->xres = mach_info->displays[i].xres && -> + var->yres = mach_info->displays[i].yres && -> + var->bits_per_pixel = mach_info->displays[i].bpp) { +> + if (var->xres == mach_info->displays[i].xres && +> + var->yres == mach_info->displays[i].yres && +> + var->bits_per_pixel == mach_info->displays[i].bpp) { > + display = mach_info->displays + i; > + break; > + } > + -> + if (display = NULL) { +> + if (display == NULL) { > + dprintk("wrong resolution or depth %dx%d at %d bit per pixel\n", > + var->xres, var->yres, var->bits_per_pixel); @@ -327,11 +327,11 @@ newline here, please. > + if (len < 1) > + return -EINVAL; > + -> + if (strnicmp(buf, "on", 2) = 0 || -> + strnicmp(buf, "1", 1) = 0) { +> + if (strnicmp(buf, "on", 2) == 0 || +> + strnicmp(buf, "1", 1) == 0) { > + debug = 1; -> + } else if (strnicmp(buf, "off", 3) = 0 || -> + strnicmp(buf, "0", 1) = 0) { +> + } else if (strnicmp(buf, "off", 3) == 0 || +> + strnicmp(buf, "0", 1) == 0) { > + debug = 0; > + > + } else { @@ -403,7 +403,7 @@ Should this be __devinit? > + > + dprintk("devinit\n"); > + mach_info = pdev->dev.platform_data; -> + if (mach_info = NULL) { +> + if (mach_info == NULL) { > + dev_err(&pdev->dev, > + "no platform data for lcd, cannot attach\n"); > + return -EINVAL; diff --git a/a/content_digest b/N1/content_digest index 933315f..e42d7e6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0ae11f36b1001110005k410620datb5444ffa795b27f3@mail.gmail.com\0" - "From\0Andrew Morton <akpm@linux-foundation.org>\0" - "Subject\0Re: [PATCH]NUC900 LCD Controller Driver\0" - "Date\0Sat, 30 Jan 2010 00:27:55 +0000\0" + "From\0akpm@linux-foundation.org (Andrew Morton)\0" + "Subject\0[PATCH]NUC900 LCD Controller Driver\0" + "Date\0Fri, 29 Jan 2010 16:27:55 -0800\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -197,20 +197,20 @@ "> +\n" "> +\t/* validate x/y resolution */\n" "> +\t/* choose default mode if possible */\n" - "> +\tif (var->xres = default_display->xres &&\n" - "> +\t var->yres = default_display->yres &&\n" - "> +\t var->bits_per_pixel = default_display->bpp)\n" + "> +\tif (var->xres == default_display->xres &&\n" + "> +\t var->yres == default_display->yres &&\n" + "> +\t var->bits_per_pixel == default_display->bpp)\n" "> +\t\tdisplay = default_display;\n" "> +\telse\n" "> +\t\tfor (i = 0; i < mach_info->num_displays; i++)\n" - "> +\t\t\tif (var->xres = mach_info->displays[i].xres &&\n" - "> +\t\t\t var->yres = mach_info->displays[i].yres &&\n" - "> +\t\t\t var->bits_per_pixel = mach_info->displays[i].bpp) {\n" + "> +\t\t\tif (var->xres == mach_info->displays[i].xres &&\n" + "> +\t\t\t var->yres == mach_info->displays[i].yres &&\n" + "> +\t\t\t var->bits_per_pixel == mach_info->displays[i].bpp) {\n" "> +\t\t\t\tdisplay = mach_info->displays + i;\n" "> +\t\t\t\tbreak;\n" "> +\t\t\t}\n" "> +\n" - "> +\tif (display = NULL) {\n" + "> +\tif (display == NULL) {\n" "> +\t\tdprintk(\"wrong resolution or depth %dx%d at %d bit per pixel\\n\",\n" "> +\t\t\tvar->xres, var->yres, var->bits_per_pixel);\n" "\n" @@ -334,11 +334,11 @@ "> +\tif (len < 1)\n" "> +\t\treturn -EINVAL;\n" "> +\n" - "> +\tif (strnicmp(buf, \"on\", 2) = 0 ||\n" - "> +\t strnicmp(buf, \"1\", 1) = 0) {\n" + "> +\tif (strnicmp(buf, \"on\", 2) == 0 ||\n" + "> +\t strnicmp(buf, \"1\", 1) == 0) {\n" "> +\t\tdebug = 1;\n" - "> +\t} else if (strnicmp(buf, \"off\", 3) = 0 ||\n" - "> +\t\t strnicmp(buf, \"0\", 1) = 0) {\n" + "> +\t} else if (strnicmp(buf, \"off\", 3) == 0 ||\n" + "> +\t\t strnicmp(buf, \"0\", 1) == 0) {\n" "> +\t\tdebug = 0;\n" "> +\n" "> +\t} else {\n" @@ -410,7 +410,7 @@ "> +\n" "> +\tdprintk(\"devinit\\n\");\n" "> +\tmach_info = pdev->dev.platform_data;\n" - "> +\tif (mach_info = NULL) {\n" + "> +\tif (mach_info == NULL) {\n" "> +\t\tdev_err(&pdev->dev,\n" "> +\t\t\t\"no platform data for lcd, cannot attach\\n\");\n" "> +\t\treturn -EINVAL;\n" @@ -499,4 +499,4 @@ "\n" The driver generally looks OK to me. Please cc me on any updates. -edee1a67f9a65d9ea0f63cdc3257e14c7f6595ee2144a57ecad7dc3e95930206 +7058691f8f96ed222e3b3244622caf0ebb798ae9c3d0dad6f446cc535e7d89c0
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.