diff for duplicates of <1364878200-26343-5-git-send-email-linux@prisktech.co.nz> diff --git a/a/1.txt b/N1/1.txt index 34e7a5c..1ac2f94 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,27 +71,27 @@ index ce23a00..b94ebc9 100644 fbi->fb.pseudo_palette = addr; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -- if (res = NULL) { +- if (res == NULL) { - dev_err(&pdev->dev, "no I/O memory resource defined\n"); - ret = -ENODEV; - goto failed_fbi; - } - - res = request_mem_region(res->start, resource_size(res), DRIVER_NAME); -- if (res = NULL) { +- if (res == NULL) { - dev_err(&pdev->dev, "failed to request I/O memory\n"); - ret = -EBUSY; - goto failed_fbi; - } - - fbi->regbase = ioremap(res->start, resource_size(res)); -- if (fbi->regbase = NULL) { +- if (fbi->regbase == NULL) { - dev_err(&pdev->dev, "failed to map I/O memory\n"); - ret = -EBUSY; - goto failed_free_res; - } + fbi->regbase = devm_request_and_ioremap(&pdev->dev, res); -+ if (fbi->regbase = NULL) ++ if (fbi->regbase == NULL) + return -EBUSY; np = of_parse_phandle(pdev->dev.of_node, "default-mode", 0); diff --git a/a/content_digest b/N1/content_digest index 00bf162..7d92d6f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01364878200-26343-1-git-send-email-linux@prisktech.co.nz\0" - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "From\0linux@prisktech.co.nz (Tony Prisk)\0" "Subject\0[PATCHv2 4/6] drivers/video/wm8505fb.c: use devm_ functions\0" - "Date\0Tue, 02 Apr 2013 04:49:58 +0000\0" + "Date\0Tue, 2 Apr 2013 17:49:58 +1300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -78,27 +78,27 @@ " \tfbi->fb.pseudo_palette\t= addr;\n" " \n" " \tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" - "-\tif (res = NULL) {\n" + "-\tif (res == NULL) {\n" "-\t\tdev_err(&pdev->dev, \"no I/O memory resource defined\\n\");\n" "-\t\tret = -ENODEV;\n" "-\t\tgoto failed_fbi;\n" "-\t}\n" "-\n" "-\tres = request_mem_region(res->start, resource_size(res), DRIVER_NAME);\n" - "-\tif (res = NULL) {\n" + "-\tif (res == NULL) {\n" "-\t\tdev_err(&pdev->dev, \"failed to request I/O memory\\n\");\n" "-\t\tret = -EBUSY;\n" "-\t\tgoto failed_fbi;\n" "-\t}\n" "-\n" "-\tfbi->regbase = ioremap(res->start, resource_size(res));\n" - "-\tif (fbi->regbase = NULL) {\n" + "-\tif (fbi->regbase == NULL) {\n" "-\t\tdev_err(&pdev->dev, \"failed to map I/O memory\\n\");\n" "-\t\tret = -EBUSY;\n" "-\t\tgoto failed_free_res;\n" "-\t}\n" "+\tfbi->regbase = devm_request_and_ioremap(&pdev->dev, res);\n" - "+\tif (fbi->regbase = NULL)\n" + "+\tif (fbi->regbase == NULL)\n" "+\t\treturn -EBUSY;\n" " \n" " \tnp = of_parse_phandle(pdev->dev.of_node, \"default-mode\", 0);\n" @@ -217,4 +217,4 @@ "-- \n" 1.7.9.5 -4131ab2184eb4d377e9ac101abb796a5f31ad8d81735bd1699c5e065d77c3856 +d069fe00f595d6bd01fac76c2d6f365a48fe753bd509414b0d71fd236f4414b7
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.