diff for duplicates of <20110125074820.GI11673@linux-sh.org> diff --git a/a/1.txt b/N1/1.txt index 9d0af00..c9e2b44 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Tue, Jan 25, 2011 at 08:20:31AM +0100, Heiko Schocher wrote: > @@ -1934,7 +1943,29 @@ static int __devinit sm501fb_probe(struct platform_device *pdev) > } > -> if (info->pdata = NULL) { +> if (info->pdata == NULL) { > - dev_info(dev, "using default configuration data\n"); > + int found = 0; > +#if defined(CONFIG_OF) @@ -18,7 +18,7 @@ On Tue, Jan 25, 2011 at 08:20:31AM +0100, Heiko Schocher wrote: > + if (cp) > + strcpy(fb_mode, cp); > + prop = of_get_property(np, "edid", &len); -> + if (prop && len = EDID_LENGTH) { +> + if (prop && len == EDID_LENGTH) { > + info->edid_data = kmemdup(prop, EDID_LENGTH, > + GFP_KERNEL); > + found = 1; @@ -32,7 +32,7 @@ On Tue, Jan 25, 2011 at 08:20:31AM +0100, Heiko Schocher wrote: > /* probe for the presence of each panel */ Starting to get a bit pedantic.. but kmemdup() tries to do a kmalloc(), -and so can fail. Your other patches handle the info->edid_data = NULL +and so can fail. Your other patches handle the info->edid_data == NULL case, in addition to the kfree(), but you're probably going to want to chomp that found assignment incase of the allocation failing and falling back on the default mode. diff --git a/a/content_digest b/N1/content_digest index 062029f..5f86295 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,23 +2,23 @@ "ref\01295940031-28268-1-git-send-email-hs@denx.de\0" "From\0Paul Mundt <lethal@linux-sh.org>\0" "Subject\0Re: [PATCH 3/4 v4] video, sm501: add OF binding to support SM501\0" - "Date\0Tue, 25 Jan 2011 07:48:20 +0000\0" + "Date\0Tue, 25 Jan 2011 16:48:20 +0900\0" "To\0Heiko Schocher <hs@denx.de>\0" - "Cc\0linuxppc-dev@lists.ozlabs.org" - linux-fbdev@vger.kernel.org + "Cc\0linux-fbdev@vger.kernel.org" devicetree-discuss@ozlabs.org - Ben Dooks <ben@simtec.co.uk> - Vincent Sanders <vince@simtec.co.uk> Samuel Ortiz <sameo@linux.intel.com> + Vincent Sanders <vince@simtec.co.uk> linux-kernel@vger.kernel.org - " Randy Dunlap <rdunlap@xenotime.net>\0" + Ben Dooks <ben@simtec.co.uk> + Randy Dunlap <rdunlap@xenotime.net> + " linuxppc-dev@lists.ozlabs.org\0" "\00:1\0" "b\0" "On Tue, Jan 25, 2011 at 08:20:31AM +0100, Heiko Schocher wrote:\n" "> @@ -1934,7 +1943,29 @@ static int __devinit sm501fb_probe(struct platform_device *pdev)\n" "> \t}\n" "> \n" - "> \tif (info->pdata = NULL) {\n" + "> \tif (info->pdata == NULL) {\n" "> -\t\tdev_info(dev, \"using default configuration data\\n\");\n" "> +\t\tint found = 0;\n" "> +#if defined(CONFIG_OF)\n" @@ -34,7 +34,7 @@ "> +\t\t\tif (cp)\n" "> +\t\t\t\tstrcpy(fb_mode, cp);\n" "> +\t\t\tprop = of_get_property(np, \"edid\", &len);\n" - "> +\t\t\tif (prop && len = EDID_LENGTH) {\n" + "> +\t\t\tif (prop && len == EDID_LENGTH) {\n" "> +\t\t\t\tinfo->edid_data = kmemdup(prop, EDID_LENGTH,\n" "> +\t\t\t\t\t\t\t GFP_KERNEL);\n" "> +\t\t\t\tfound = 1;\n" @@ -48,7 +48,7 @@ "> \t/* probe for the presence of each panel */\n" "\n" "Starting to get a bit pedantic.. but kmemdup() tries to do a kmalloc(),\n" - "and so can fail. Your other patches handle the info->edid_data = NULL\n" + "and so can fail. Your other patches handle the info->edid_data == NULL\n" "case, in addition to the kfree(), but you're probably going to want to\n" "chomp that found assignment incase of the allocation failing and falling\n" "back on the default mode.\n" @@ -67,4 +67,4 @@ "\n" "\t..." -ca873635cecf5ff565fd1e9ac9e6440a59aac0bf570cdaefe6a2967b077dc9ad +54be48334ef0859f26237cd64f0989ba8f414124043310fc1234f5bfd7fcf797
diff --git a/a/1.txt b/N2/1.txt index 9d0af00..c9e2b44 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ On Tue, Jan 25, 2011 at 08:20:31AM +0100, Heiko Schocher wrote: > @@ -1934,7 +1943,29 @@ static int __devinit sm501fb_probe(struct platform_device *pdev) > } > -> if (info->pdata = NULL) { +> if (info->pdata == NULL) { > - dev_info(dev, "using default configuration data\n"); > + int found = 0; > +#if defined(CONFIG_OF) @@ -18,7 +18,7 @@ On Tue, Jan 25, 2011 at 08:20:31AM +0100, Heiko Schocher wrote: > + if (cp) > + strcpy(fb_mode, cp); > + prop = of_get_property(np, "edid", &len); -> + if (prop && len = EDID_LENGTH) { +> + if (prop && len == EDID_LENGTH) { > + info->edid_data = kmemdup(prop, EDID_LENGTH, > + GFP_KERNEL); > + found = 1; @@ -32,7 +32,7 @@ On Tue, Jan 25, 2011 at 08:20:31AM +0100, Heiko Schocher wrote: > /* probe for the presence of each panel */ Starting to get a bit pedantic.. but kmemdup() tries to do a kmalloc(), -and so can fail. Your other patches handle the info->edid_data = NULL +and so can fail. Your other patches handle the info->edid_data == NULL case, in addition to the kfree(), but you're probably going to want to chomp that found assignment incase of the allocation failing and falling back on the default mode. diff --git a/a/content_digest b/N2/content_digest index 062029f..2eaccd5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01295940031-28268-1-git-send-email-hs@denx.de\0" "From\0Paul Mundt <lethal@linux-sh.org>\0" "Subject\0Re: [PATCH 3/4 v4] video, sm501: add OF binding to support SM501\0" - "Date\0Tue, 25 Jan 2011 07:48:20 +0000\0" + "Date\0Tue, 25 Jan 2011 16:48:20 +0900\0" "To\0Heiko Schocher <hs@denx.de>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" linux-fbdev@vger.kernel.org @@ -18,7 +18,7 @@ "> @@ -1934,7 +1943,29 @@ static int __devinit sm501fb_probe(struct platform_device *pdev)\n" "> \t}\n" "> \n" - "> \tif (info->pdata = NULL) {\n" + "> \tif (info->pdata == NULL) {\n" "> -\t\tdev_info(dev, \"using default configuration data\\n\");\n" "> +\t\tint found = 0;\n" "> +#if defined(CONFIG_OF)\n" @@ -34,7 +34,7 @@ "> +\t\t\tif (cp)\n" "> +\t\t\t\tstrcpy(fb_mode, cp);\n" "> +\t\t\tprop = of_get_property(np, \"edid\", &len);\n" - "> +\t\t\tif (prop && len = EDID_LENGTH) {\n" + "> +\t\t\tif (prop && len == EDID_LENGTH) {\n" "> +\t\t\t\tinfo->edid_data = kmemdup(prop, EDID_LENGTH,\n" "> +\t\t\t\t\t\t\t GFP_KERNEL);\n" "> +\t\t\t\tfound = 1;\n" @@ -48,7 +48,7 @@ "> \t/* probe for the presence of each panel */\n" "\n" "Starting to get a bit pedantic.. but kmemdup() tries to do a kmalloc(),\n" - "and so can fail. Your other patches handle the info->edid_data = NULL\n" + "and so can fail. Your other patches handle the info->edid_data == NULL\n" "case, in addition to the kfree(), but you're probably going to want to\n" "chomp that found assignment incase of the allocation failing and falling\n" "back on the default mode.\n" @@ -67,4 +67,4 @@ "\n" "\t..." -ca873635cecf5ff565fd1e9ac9e6440a59aac0bf570cdaefe6a2967b077dc9ad +c78fa00bd094153887cb9db36bfaa09ebc14a0929295a01f7eb3e5804ed671c8
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.