diff for duplicates of <4F56F631.8060901@renesas.com> diff --git a/a/1.txt b/N1/1.txt index dfec395..2a94f60 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -237,7 +237,7 @@ index 0000000..354f170 + rspi->spsr = rspi_read8(rspi, RSPI_SPSR); + rspi_enable_irq(rspi, enable_bit); + ret = wait_event_timeout(rspi->wait, rspi->spsr & wait_mask, HZ); -+ if (ret = 0 && !(rspi->spsr & wait_mask)) ++ if (ret == 0 && !(rspi->spsr & wait_mask)) + return -ETIMEDOUT; + + return 0; @@ -474,7 +474,7 @@ index 0000000..354f170 + + /* get base addr */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (unlikely(res = NULL)) { ++ if (unlikely(res == NULL)) { + dev_err(&pdev->dev, "invalid resource\n"); + return -EINVAL; + } @@ -486,7 +486,7 @@ index 0000000..354f170 + } + + master = spi_alloc_master(&pdev->dev, sizeof(struct rspi_data)); -+ if (master = NULL) { ++ if (master == NULL) { + dev_err(&pdev->dev, "spi_alloc_master error.\n"); + return -ENOMEM; + } @@ -496,7 +496,7 @@ index 0000000..354f170 + + rspi->master = master; + rspi->addr = ioremap(res->start, resource_size(res)); -+ if (rspi->addr = NULL) { ++ if (rspi->addr == NULL) { + dev_err(&pdev->dev, "ioremap error.\n"); + ret = -ENOMEM; + goto error1; diff --git a/a/content_digest b/N1/content_digest index 4442991..928f18d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Shimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com>\0" "Subject\0[PATCH RESEND] spi: add support for Renesas RSPI\0" - "Date\0Wed, 07 Mar 2012 05:46:25 +0000\0" + "Date\0Wed, 07 Mar 2012 14:46:25 +0900\0" "To\0Grant Likely <grant.likely@secretlab.ca>\0" "Cc\0spi-devel-general@lists.sourceforge.net" " SH-Linux <linux-sh@vger.kernel.org>\0" @@ -245,7 +245,7 @@ "+\trspi->spsr = rspi_read8(rspi, RSPI_SPSR);\n" "+\trspi_enable_irq(rspi, enable_bit);\n" "+\tret = wait_event_timeout(rspi->wait, rspi->spsr & wait_mask, HZ);\n" - "+\tif (ret = 0 && !(rspi->spsr & wait_mask))\n" + "+\tif (ret == 0 && !(rspi->spsr & wait_mask))\n" "+\t\treturn -ETIMEDOUT;\n" "+\n" "+\treturn 0;\n" @@ -482,7 +482,7 @@ "+\n" "+\t/* get base addr */\n" "+\tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" - "+\tif (unlikely(res = NULL)) {\n" + "+\tif (unlikely(res == NULL)) {\n" "+\t\tdev_err(&pdev->dev, \"invalid resource\\n\");\n" "+\t\treturn -EINVAL;\n" "+\t}\n" @@ -494,7 +494,7 @@ "+\t}\n" "+\n" "+\tmaster = spi_alloc_master(&pdev->dev, sizeof(struct rspi_data));\n" - "+\tif (master = NULL) {\n" + "+\tif (master == NULL) {\n" "+\t\tdev_err(&pdev->dev, \"spi_alloc_master error.\\n\");\n" "+\t\treturn -ENOMEM;\n" "+\t}\n" @@ -504,7 +504,7 @@ "+\n" "+\trspi->master = master;\n" "+\trspi->addr = ioremap(res->start, resource_size(res));\n" - "+\tif (rspi->addr = NULL) {\n" + "+\tif (rspi->addr == NULL) {\n" "+\t\tdev_err(&pdev->dev, \"ioremap error.\\n\");\n" "+\t\tret = -ENOMEM;\n" "+\t\tgoto error1;\n" @@ -575,4 +575,4 @@ "-- \n" 1.7.1 -b41f6755be920a3044f57203ce2430aa71d9589b5956e0a7be81e2ff498d5886 +80214c7501a8045d46aafc9e28824744ce934f6dd36e44a49d80ee18ebd3d99a
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.