diff for duplicates of <20100723131034.GA6618@joi.lan> diff --git a/a/1.txt b/N1/1.txt index e40abb5..ad6e835 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -104,7 +104,7 @@ index 731fce6..cb19cae 100644 +{ + struct resource *res = request_mem_region(VGA_FB_PHYS, + VGA_FB_PHYS_LEN, name); -+ if (res = NULL) ++ if (res == NULL) + printk(KERN_INFO "%s: other driver owns the primary card, refusing to load\n", + name); + return res; @@ -121,7 +121,7 @@ index 731fce6..cb19cae 100644 + bool primary; + struct resource *res = fb_info->resource; - if (num_registered_fb = FB_MAX) + if (num_registered_fb == FB_MAX) return -ENXIO; @@ -1555,8 +1569,19 @@ register_framebuffer(struct fb_info *fb_info) if (fb_check_foreignness(fb_info)) @@ -136,9 +136,9 @@ index 731fce6..cb19cae 100644 + * if the card is primary and the resource was not already allocated + * by framebuffer driver then lock vga memory region + */ -+ if (primary && res = NULL) { ++ if (primary && res == NULL) { + res = request_vga_mem_region(fb_info->fix.id); -+ if (res = NULL) ++ if (res == NULL) + return -EBUSY; + } @@ -150,7 +150,7 @@ index 731fce6..cb19cae 100644 fb_init_device(fb_info); + fb_info->resource = res; - if (fb_info->pixmap.addr = NULL) { + if (fb_info->pixmap.addr == NULL) { fb_info->pixmap.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL); @@ -1658,6 +1684,11 @@ unregister_framebuffer(struct fb_info *fb_info) num_registered_fb--; diff --git a/a/content_digest b/N1/content_digest index 496e7e0..ea1ac56 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020100720191923.GA11056@joi.lan\0" "ref\020100722172039.e935c67d.akpm@linux-foundation.org\0" "From\0Marcin Slusarz <marcin.slusarz@gmail.com>\0" - "Subject\0[PATCH v2] vga16fb: refuse to load in face of other driver\0" - "Date\0Fri, 23 Jul 2010 13:10:34 +0000\0" + "Subject\0[PATCH v2] vga16fb: refuse to load in face of other driver controlling primary card\0" + "Date\0Fri, 23 Jul 2010 15:10:34 +0200\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" linux-fbdev@vger.kernel.org @@ -115,7 +115,7 @@ "+{\n" "+\tstruct resource *res = request_mem_region(VGA_FB_PHYS,\n" "+\t\t\t\t\t\tVGA_FB_PHYS_LEN, name);\n" - "+\tif (res = NULL)\n" + "+\tif (res == NULL)\n" "+\t\tprintk(KERN_INFO \"%s: other driver owns the primary card, refusing to load\\n\",\n" "+\t\t\t\t name);\n" "+\treturn res;\n" @@ -132,7 +132,7 @@ "+\tbool primary;\n" "+\tstruct resource *res = fb_info->resource;\n" " \n" - " \tif (num_registered_fb = FB_MAX)\n" + " \tif (num_registered_fb == FB_MAX)\n" " \t\treturn -ENXIO;\n" "@@ -1555,8 +1569,19 @@ register_framebuffer(struct fb_info *fb_info)\n" " \tif (fb_check_foreignness(fb_info))\n" @@ -147,9 +147,9 @@ "+\t * if the card is primary and the resource was not already allocated\n" "+\t * by framebuffer driver then lock vga memory region\n" "+\t */\n" - "+\tif (primary && res = NULL) {\n" + "+\tif (primary && res == NULL) {\n" "+\t\tres = request_vga_mem_region(fb_info->fix.id);\n" - "+\t\tif (res = NULL)\n" + "+\t\tif (res == NULL)\n" "+\t\t\treturn -EBUSY;\n" "+\t}\n" " \n" @@ -161,7 +161,7 @@ " \t\tfb_init_device(fb_info);\n" "+\tfb_info->resource = res;\n" " \n" - " \tif (fb_info->pixmap.addr = NULL) {\n" + " \tif (fb_info->pixmap.addr == NULL) {\n" " \t\tfb_info->pixmap.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL);\n" "@@ -1658,6 +1684,11 @@ unregister_framebuffer(struct fb_info *fb_info)\n" " \tnum_registered_fb--;\n" @@ -236,4 +236,4 @@ "-- \n" 1.7.1.1 -84a2ae65834890c6f16581c258cadf94679b8d5fc11cf14c3d85e150f683d5f8 +c9ad664ff71ea553747ac5b71b78c4c7107e0c8007b0747fa3de03d78f3c387e
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.