diff for duplicates of <4172444.b80tq3sQnW@avalon> diff --git a/a/1.txt b/N1/1.txt index a3068c7..0ab415a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -101,7 +101,7 @@ On Wednesday 05 March 2014 20:30:27 Laurent Pinchart wrote: > { > - 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; @@ -137,11 +137,11 @@ On Wednesday 05 March 2014 20:30:27 Laurent Pinchart wrote: > + 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")) @@ -159,7 +159,7 @@ On Wednesday 05 March 2014 20:30:27 Laurent Pinchart wrote: > } > > @@ -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 97e1171..7f753eb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\04542787.8JEGs6DclK@avalon\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 4/6] v4l: vsp1: Add DT support\0" - "Date\0Tue, 25 Mar 2014 12:18:22 +0000\0" + "Date\0Tue, 25 Mar 2014 13:18:22 +0100\0" "To\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\0" "Cc\0linux-media@vger.kernel.org" linux-sh@vger.kernel.org @@ -112,7 +112,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" @@ -148,11 +148,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" @@ -170,7 +170,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" @@ -205,4 +205,4 @@ "\n" Laurent Pinchart -e92eb07f8514101e08bdf8d046785fd6014c58c3fc9caad5c3ac95b7921d321e +7ed165b6c60f44e1184e6cbca5097cdee0ec847094782a5909a3ff4b80eecbab
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.