diff for duplicates of <4BDB1C46.8020101@gmx.de> diff --git a/a/1.txt b/N1/1.txt index 7dbfe42..3e02cba 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -58,7 +58,7 @@ Florian Tobias Schandinat > vdev->engine_mmio = ioremap_nocache(vdev->engine_start, > vdev->engine_len); > - -> + if (vdev->engine_mmio = NULL) +> + if (vdev->engine_mmio == NULL) > + return -ENOMEM; > /* > - * Likewise with I/O memory. @@ -72,9 +72,9 @@ Florian Tobias Schandinat > + if (ret < 0) > + goto out_unmap; > vdev->fbmem = ioremap_nocache(vdev->fbmem_start, vdev->fbmem_len); -> - if (vdev->fbmem = NULL) +> - if (vdev->fbmem == NULL) > - return -ENOMEM; -> + if (vdev->fbmem = NULL) { +> + if (vdev->fbmem == NULL) { > + ret = -ENOMEM; > + goto out_unmap; > + } diff --git a/a/content_digest b/N1/content_digest index dc947c8..d25f047 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\020100430102157.5eb59055@bike.lwn.net\0" "From\0Florian Tobias Schandinat <FlorianSchandinat@gmx.de>\0" "Subject\0Re: [PATCH 13/30] viafb: Separate global and fb-specific data\0" - "Date\0Fri, 30 Apr 2010 18:07:02 +0000\0" + "Date\0Fri, 30 Apr 2010 20:07:02 +0200\0" "To\0Jonathan Corbet <corbet@lwn.net>\0" "Cc\0Bruno Pr\303\251mont <bonbons@linux-vserver.org>" linux-kernel@vger.kernel.org @@ -74,7 +74,7 @@ "> \tvdev->engine_mmio = ioremap_nocache(vdev->engine_start,\n" "> \t\t\tvdev->engine_len);\n" "> -\n" - "> +\tif (vdev->engine_mmio = NULL)\n" + "> +\tif (vdev->engine_mmio == NULL)\n" "> +\t\treturn -ENOMEM;\n" "> \t/*\n" "> -\t * Likewise with I/O memory.\n" @@ -88,9 +88,9 @@ "> +\tif (ret < 0)\n" "> +\t\tgoto out_unmap;\n" "> \tvdev->fbmem = ioremap_nocache(vdev->fbmem_start, vdev->fbmem_len);\n" - "> -\tif (vdev->fbmem = NULL)\n" + "> -\tif (vdev->fbmem == NULL)\n" "> -\t\treturn -ENOMEM;\n" - "> +\tif (vdev->fbmem = NULL) {\n" + "> +\tif (vdev->fbmem == NULL) {\n" "> +\t\tret = -ENOMEM;\n" "> +\t\tgoto out_unmap;\n" "> +\t}\n" @@ -118,4 +118,4 @@ "> \t * Create our subdevices.\n" "> \t */" -16de5bc8ad7cf5a4540c46a6cd12065b80b74fe2619db6b50838a4d4585a01ee +c95333af000a59d32c0ab93ea2fded968dac34e63d0cc45bdbfc534f0b2ce06c
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.