diff for duplicates of <4542787.8JEGs6DclK@avalon> diff --git a/a/1.txt b/N1/1.txt index 8af7801..95b8c72 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -87,7 +87,7 @@ index 5f774cc..b75ca84 100644 { - struct vsp1_platform_data *pdata = pdev->dev.platform_data; - - if (pdata = NULL) { + if (pdata == NULL) { dev_err(&pdev->dev, "missing platform data\n"); - return NULL; + return -EINVAL; @@ -123,11 +123,11 @@ index 5f774cc..b75ca84 100644 + struct device_node *np = pdev->dev.of_node; + struct vsp1_platform_data *pdata; + -+ if (!IS_ENABLED(CONFIG_OF) || np = NULL) ++ if (!IS_ENABLED(CONFIG_OF) || np == NULL) + return pdev->dev.platform_data; + + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); -+ if (pdata = NULL) ++ if (pdata == NULL) + return NULL; + + if (of_property_read_bool(np, "renesas,has-lif")) @@ -145,7 +145,7 @@ index 5f774cc..b75ca84 100644 } @@ -508,6 +534,10 @@ static int vsp1_probe(struct platform_device *pdev) - if (vsp1->pdata = NULL) + if (vsp1->pdata == NULL) return -ENODEV; + ret = vsp1_validate_platform_data(pdev, vsp1->pdata); diff --git a/a/content_digest b/N1/content_digest index 05a7fe0..44e85c2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01394047444-30077-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "From\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\0" "Subject\0[PATCH 4/6] v4l: vsp1: Add DT support\0" - "Date\0Wed, 05 Mar 2014 19:30:27 +0000\0" + "Date\0Wed, 05 Mar 2014 20:30:27 +0100\0" "To\0linux-media@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org" " devicetree@vger.kernel.org\0" @@ -96,7 +96,7 @@ " {\n" "-\tstruct vsp1_platform_data *pdata = pdev->dev.platform_data;\n" "-\n" - " \tif (pdata = NULL) {\n" + " \tif (pdata == NULL) {\n" " \t\tdev_err(&pdev->dev, \"missing platform data\\n\");\n" "-\t\treturn NULL;\n" "+\t\treturn -EINVAL;\n" @@ -132,11 +132,11 @@ "+\tstruct device_node *np = pdev->dev.of_node;\n" "+\tstruct vsp1_platform_data *pdata;\n" "+\n" - "+\tif (!IS_ENABLED(CONFIG_OF) || np = NULL)\n" + "+\tif (!IS_ENABLED(CONFIG_OF) || np == NULL)\n" "+\t\treturn pdev->dev.platform_data;\n" "+\n" "+\tpdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);\n" - "+\tif (pdata = NULL)\n" + "+\tif (pdata == NULL)\n" "+\t\treturn NULL;\n" "+\n" "+\tif (of_property_read_bool(np, \"renesas,has-lif\"))\n" @@ -154,7 +154,7 @@ " }\n" " \n" "@@ -508,6 +534,10 @@ static int vsp1_probe(struct platform_device *pdev)\n" - " \tif (vsp1->pdata = NULL)\n" + " \tif (vsp1->pdata == NULL)\n" " \t\treturn -ENODEV;\n" " \n" "+\tret = vsp1_validate_platform_data(pdev, vsp1->pdata);\n" @@ -187,4 +187,4 @@ "-- \n" 1.8.3.2 -8697a19918153fc2a86879b03157bd22b3e189141ad79fb125cf31ec50f368e8 +12a18d441c5d859c9ac1b6dd1b2ff13b32ace9b7dd8a80099061b5f599780f2c
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.