diff for duplicates of <4D3E8387.10501@denx.de> diff --git a/a/1.txt b/N1/1.txt index e5480f1..8b8fe4e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ Paul Mundt 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) @@ -21,7 +21,7 @@ Paul Mundt 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; @@ -38,7 +38,7 @@ Paul Mundt wrote: No problem! -> 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 0113a37..44d0dd9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,18 @@ "ref\01291451028-22532-1-git-send-email-hs@denx.de\0" "ref\01295940031-28268-1-git-send-email-hs@denx.de\0" "ref\020110125074820.GI11673@linux-sh.org\0" - "ref\020110125074820.GI11673-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org\0" "From\0Heiko Schocher <hs@denx.de>\0" "Subject\0Re: [PATCH 3/4 v4] video, sm501: add OF binding to support SM501\0" - "Date\0Tue, 25 Jan 2011 08:02:15 +0000\0" - "To\0Paul Mundt <lethal-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org>\0" - "Cc\0linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - devicetree-discuss-mnsaURCQ41sdnm+yROfE0A@public.gmane.org - Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> - Vincent Sanders <vince-Y5A6D6n0/KfQXOPxS62xeg@public.gmane.org> - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Ben Dooks <ben-Y5A6D6n0/KfQXOPxS62xeg@public.gmane.org> - Randy Dunlap <rdunlap-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org> - " linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" + "Date\0Tue, 25 Jan 2011 09:02:15 +0100\0" + "To\0Paul Mundt <lethal@linux-sh.org>\0" + "Cc\0linux-fbdev@vger.kernel.org" + devicetree-discuss@ozlabs.org + Samuel Ortiz <sameo@linux.intel.com> + Vincent Sanders <vince@simtec.co.uk> + linux-kernel@vger.kernel.org + Ben Dooks <ben@simtec.co.uk> + Randy Dunlap <rdunlap@xenotime.net> + " linuxppc-dev@lists.ozlabs.org\0" "\00:1\0" "b\0" "Hello Paul,\n" @@ -23,7 +22,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" @@ -39,7 +38,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" @@ -56,7 +55,7 @@ "\n" "No problem!\n" "\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" @@ -83,4 +82,4 @@ "DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel\n" HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -7575c0f70d5cbe555a6dffc06279c7ade4e53116a9757bca00c0793051cedaa6 +0b909b1b65ac86ecd11f715904ff715f90eec93f9642ca417adef3111eb355f8
diff --git a/a/1.txt b/N2/1.txt index e5480f1..8b8fe4e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -5,7 +5,7 @@ Paul Mundt 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) @@ -21,7 +21,7 @@ Paul Mundt 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; @@ -38,7 +38,7 @@ Paul Mundt wrote: No problem! -> 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 0113a37..8eff4d3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,19 +1,18 @@ "ref\01291451028-22532-1-git-send-email-hs@denx.de\0" "ref\01295940031-28268-1-git-send-email-hs@denx.de\0" "ref\020110125074820.GI11673@linux-sh.org\0" - "ref\020110125074820.GI11673-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org\0" "From\0Heiko Schocher <hs@denx.de>\0" "Subject\0Re: [PATCH 3/4 v4] video, sm501: add OF binding to support SM501\0" - "Date\0Tue, 25 Jan 2011 08:02:15 +0000\0" - "To\0Paul Mundt <lethal-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org>\0" - "Cc\0linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - devicetree-discuss-mnsaURCQ41sdnm+yROfE0A@public.gmane.org - Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> - Vincent Sanders <vince-Y5A6D6n0/KfQXOPxS62xeg@public.gmane.org> - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Ben Dooks <ben-Y5A6D6n0/KfQXOPxS62xeg@public.gmane.org> - Randy Dunlap <rdunlap-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org> - " linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" + "Date\0Tue, 25 Jan 2011 09:02:15 +0100\0" + "To\0Paul Mundt <lethal@linux-sh.org>\0" + "Cc\0linuxppc-dev@lists.ozlabs.org" + linux-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> + linux-kernel@vger.kernel.org + " Randy Dunlap <rdunlap@xenotime.net>\0" "\00:1\0" "b\0" "Hello Paul,\n" @@ -23,7 +22,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" @@ -39,7 +38,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" @@ -56,7 +55,7 @@ "\n" "No problem!\n" "\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" @@ -83,4 +82,4 @@ "DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel\n" HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -7575c0f70d5cbe555a6dffc06279c7ade4e53116a9757bca00c0793051cedaa6 +12c568653034829a5523c830388ae7ac58fa27fcb2a47eaf50befb89f57802fb
diff --git a/a/1.txt b/N3/1.txt index e5480f1..8b8fe4e 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -5,7 +5,7 @@ Paul Mundt 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) @@ -21,7 +21,7 @@ Paul Mundt 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; @@ -38,7 +38,7 @@ Paul Mundt wrote: No problem! -> 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/N3/content_digest index 0113a37..0106019 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,9 +2,9 @@ "ref\01295940031-28268-1-git-send-email-hs@denx.de\0" "ref\020110125074820.GI11673@linux-sh.org\0" "ref\020110125074820.GI11673-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org\0" - "From\0Heiko Schocher <hs@denx.de>\0" + "From\0Heiko Schocher <hs-ynQEQJNshbs@public.gmane.org>\0" "Subject\0Re: [PATCH 3/4 v4] video, sm501: add OF binding to support SM501\0" - "Date\0Tue, 25 Jan 2011 08:02:15 +0000\0" + "Date\0Tue, 25 Jan 2011 09:02:15 +0100\0" "To\0Paul Mundt <lethal-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org>\0" "Cc\0linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" devicetree-discuss-mnsaURCQ41sdnm+yROfE0A@public.gmane.org @@ -23,7 +23,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" @@ -39,7 +39,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" @@ -56,7 +56,7 @@ "\n" "No problem!\n" "\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" @@ -83,4 +83,4 @@ "DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel\n" HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -7575c0f70d5cbe555a6dffc06279c7ade4e53116a9757bca00c0793051cedaa6 +b803572f8403fa577a6019bc376daf9113fbde893e7bda5f5177300adc715c26
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.