diff for duplicates of <201102201946.20681.marek.vasut@gmail.com> diff --git a/a/1.txt b/N1/1.txt index cc2caa9..18d9748 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -51,13 +51,13 @@ Hm? > > lcd_writel(ofb->fbi, LCSR1, LCSR1_BS(2)); > @@ -720,12 +726,10 @@ static int overlayfb_open(struct fb_info *info, int -> user) if (user = 0) +> user) if (user == 0) > return -ENODEV; > > - /* allow only one user at a time */ > - if (atomic_inc_and_test(&ofb->usage)) > - return -EBUSY; -> + if (ofb->usage++ = 0) +> + if (ofb->usage++ == 0) > + /* unblank the base framebuffer */ > + fb_blank(&ofb->fbi->fb, FB_BLANK_UNBLANK); > @@ -76,7 +76,7 @@ Hm? > - free_pages_exact(ofb->video_mem, ofb->video_mem_size); > - ofb->video_mem = NULL; > - ofb->video_mem_size = 0; -> + if (--ofb->usage = 0) { +> + if (--ofb->usage == 0) { > + ofb->ops->disable(ofb); > + ofb->fb.var.height = -1; > + ofb->fb.var.width = -1; diff --git a/a/content_digest b/N1/content_digest index 7bd2e4d..3e0aee0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020110217110321.GF24627@n2100.arm.linux.org.uk\0" "ref\01298214147-11578-1-git-send-email-anarsoul@gmail.com\0" - "From\0Marek Vasut <marek.vasut@gmail.com>\0" - "Subject\0Re: [PATCH v2 1/3] ARM: PXA: PXAFB: Fix double-free issue\0" - "Date\0Sun, 20 Feb 2011 18:46:20 +0000\0" + "From\0marek.vasut@gmail.com (Marek Vasut)\0" + "Subject\0[PATCH v2 1/3] ARM: PXA: PXAFB: Fix double-free issue\0" + "Date\0Sun, 20 Feb 2011 19:46:20 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -59,13 +59,13 @@ "> \n" "> \tlcd_writel(ofb->fbi, LCSR1, LCSR1_BS(2));\n" "> @@ -720,12 +726,10 @@ static int overlayfb_open(struct fb_info *info, int\n" - "> user) if (user = 0)\n" + "> user) if (user == 0)\n" "> \t\treturn -ENODEV;\n" "> \n" "> -\t/* allow only one user at a time */\n" "> -\tif (atomic_inc_and_test(&ofb->usage))\n" "> -\t\treturn -EBUSY;\n" - "> +\tif (ofb->usage++ = 0)\n" + "> +\tif (ofb->usage++ == 0)\n" "> +\t\t/* unblank the base framebuffer */\n" "> +\t\tfb_blank(&ofb->fbi->fb, FB_BLANK_UNBLANK);\n" "> \n" @@ -84,7 +84,7 @@ "> -\tfree_pages_exact(ofb->video_mem, ofb->video_mem_size);\n" "> -\tofb->video_mem = NULL;\n" "> -\tofb->video_mem_size = 0;\n" - "> +\tif (--ofb->usage = 0) {\n" + "> +\tif (--ofb->usage == 0) {\n" "> +\t\tofb->ops->disable(ofb);\n" "> +\t\tofb->fb.var.height\t= -1;\n" "> +\t\tofb->fb.var.width\t= -1;\n" @@ -159,4 +159,4 @@ "> \n" "> \tstruct pxafb_layer_ops\t*ops;" -b52a0c51a2d4f760524323424d68cabb71946585adc95e4b182d0ce1bffc0df6 +1330edace070d55e913a057d670244c9bc59809b5693575e34e8f4b06ce21923
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.