diff for duplicates of <20190107173132.27316-1-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 10d7dad..414f473 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,7 +60,8 @@ index 31f769d67195..057d3cdef92e 100644 - } else if (!strncmp(name, "ATY,", 4)) { + } else if (of_node_name_prefix(dp, "ATY,")) { unsigned long base = address & 0xff000000UL; - par->cmap_adr ioremap(base + 0x7ff000, 0x1000) + 0xcc0; + par->cmap_adr = + ioremap(base + 0x7ff000, 0x1000) + 0xcc0; @@ -350,7 +350,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp par->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000); if (par->cmap_adr) @@ -73,7 +74,7 @@ index 31f769d67195..057d3cdef92e 100644 @@ -438,7 +438,7 @@ static void __init offb_init_fb(const char *name, par->cmap_type = cmap_unknown; - if (depth = 8) + if (depth == 8) - offb_init_palette_hacks(info, dp, name, address); + offb_init_palette_hacks(info, dp, address); else diff --git a/a/content_digest b/N1/content_digest index c51eb83..3e293ae 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH] fbdev: offb: Fix OF node name handling\0" - "Date\0Mon, 07 Jan 2019 17:31:32 +0000\0" + "Date\0Mon, 7 Jan 2019 11:31:32 -0600\0" "To\0Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>\0" "Cc\0Elimar Riesebieter <riesebie@lxtec.de>" linux-kernel@vger.kernel.org @@ -72,7 +72,8 @@ "-\t} else if (!strncmp(name, \"ATY,\", 4)) {\n" "+\t} else if (of_node_name_prefix(dp, \"ATY,\")) {\n" " \t\tunsigned long base = address & 0xff000000UL;\n" - " \t\tpar->cmap_adr \t\t\tioremap(base + 0x7ff000, 0x1000) + 0xcc0;\n" + " \t\tpar->cmap_adr =\n" + " \t\t\tioremap(base + 0x7ff000, 0x1000) + 0xcc0;\n" "@@ -350,7 +350,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp\n" " \t\tpar->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000);\n" " \t\tif (par->cmap_adr)\n" @@ -85,7 +86,7 @@ "@@ -438,7 +438,7 @@ static void __init offb_init_fb(const char *name,\n" " \n" " \tpar->cmap_type = cmap_unknown;\n" - " \tif (depth = 8)\n" + " \tif (depth == 8)\n" "-\t\toffb_init_palette_hacks(info, dp, name, address);\n" "+\t\toffb_init_palette_hacks(info, dp, address);\n" " \telse\n" @@ -94,4 +95,4 @@ "-- \n" 2.19.1 -4dedf837fa1d0093e443e82b2b943431c19a172fa1dcfeb658e720b653f235b6 +ea55ef41f27cf08ba8fec8e9ad21abc028320495681c8e81ed2312f810df936f
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.