diff for duplicates of <20160504062546.GG22064@mwanda> diff --git a/a/1.txt b/N1/1.txt index bcb7e42..c388cc7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ and remove the call. Also there is no need to set rs->dma_tx.ch to NULL on this error path. Fixes: e4c0e06f949b ('spi: rockchip: fix probe deferral handling') -Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> +Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 6c6c001..cd89682 100644 @@ -14,7 +14,7 @@ index 6c6c001..cd89682 100644 @@ -744,10 +744,8 @@ static int rockchip_spi_probe(struct platform_device *pdev) rs->dma_rx.ch = dma_request_chan(rs->dev, "rx"); if (IS_ERR(rs->dma_rx.ch)) { - if (PTR_ERR(rs->dma_rx.ch) = -EPROBE_DEFER) { + if (PTR_ERR(rs->dma_rx.ch) == -EPROBE_DEFER) { - dma_release_channel(rs->dma_tx.ch); - rs->dma_tx.ch = NULL; ret = -EPROBE_DEFER; diff --git a/a/content_digest b/N1/content_digest index 7f50d25..c949c26 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" + "From\0Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\0" "Subject\0[patch] spi: rockchip: potential NULL dereference on error\0" - "Date\0Wed, 04 May 2016 06:25:46 +0000\0" + "Date\0Wed, 4 May 2016 09:25:46 +0300\0" "To\0Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" " Shawn Lin <shawn.lin-TNX95d0MmH7DzftRWevZcw@public.gmane.org>\0" "Cc\0linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" @@ -17,7 +17,7 @@ "NULL on this error path.\n" "\n" "Fixes: e4c0e06f949b ('spi: rockchip: fix probe deferral handling')\n" - "Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n" + "Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\n" "\n" "diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c\n" "index 6c6c001..cd89682 100644\n" @@ -26,7 +26,7 @@ "@@ -744,10 +744,8 @@ static int rockchip_spi_probe(struct platform_device *pdev)\n" " \trs->dma_rx.ch = dma_request_chan(rs->dev, \"rx\");\n" " \tif (IS_ERR(rs->dma_rx.ch)) {\n" - " \t\tif (PTR_ERR(rs->dma_rx.ch) = -EPROBE_DEFER) {\n" + " \t\tif (PTR_ERR(rs->dma_rx.ch) == -EPROBE_DEFER) {\n" "-\t\t\tdma_release_channel(rs->dma_tx.ch);\n" "-\t\t\trs->dma_tx.ch = NULL;\n" " \t\t\tret = -EPROBE_DEFER;\n" @@ -50,4 +50,4 @@ " \tclk_disable_unprepare(rs->spiclk);\n" err_spiclk_enable: -a94c64a37327feaffe302fc218c73855cd8692966555f0084e7504cccad518cc +2fcb6d6b02dcc5bdd214138dd3ec9a6dae6b24f6d1d70b0eb39a9612a7186b4a
diff --git a/a/1.txt b/N2/1.txt index bcb7e42..13378ad 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -14,7 +14,7 @@ index 6c6c001..cd89682 100644 @@ -744,10 +744,8 @@ static int rockchip_spi_probe(struct platform_device *pdev) rs->dma_rx.ch = dma_request_chan(rs->dev, "rx"); if (IS_ERR(rs->dma_rx.ch)) { - if (PTR_ERR(rs->dma_rx.ch) = -EPROBE_DEFER) { + if (PTR_ERR(rs->dma_rx.ch) == -EPROBE_DEFER) { - dma_release_channel(rs->dma_tx.ch); - rs->dma_tx.ch = NULL; ret = -EPROBE_DEFER; diff --git a/a/content_digest b/N2/content_digest index 7f50d25..da64f2d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,13 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] spi: rockchip: potential NULL dereference on error\0" - "Date\0Wed, 04 May 2016 06:25:46 +0000\0" - "To\0Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" - " Shawn Lin <shawn.lin-TNX95d0MmH7DzftRWevZcw@public.gmane.org>\0" - "Cc\0linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" - kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Date\0Wed, 4 May 2016 09:25:46 +0300\0" + "To\0Mark Brown <broonie@kernel.org>" + " Shawn Lin <shawn.lin@rock-chips.com>\0" + "Cc\0Heiko Stuebner <heiko@sntech.de>" + linux-spi@vger.kernel.org + linux-rockchip@lists.infradead.org + linux-kernel@vger.kernel.org + " kernel-janitors@vger.kernel.org\0" "\00:1\0" "b\0" "We were calling dma_release_channel(rs->dma_tx.ch) when \"rs->dma_tx.ch\"\n" @@ -26,7 +26,7 @@ "@@ -744,10 +744,8 @@ static int rockchip_spi_probe(struct platform_device *pdev)\n" " \trs->dma_rx.ch = dma_request_chan(rs->dev, \"rx\");\n" " \tif (IS_ERR(rs->dma_rx.ch)) {\n" - " \t\tif (PTR_ERR(rs->dma_rx.ch) = -EPROBE_DEFER) {\n" + " \t\tif (PTR_ERR(rs->dma_rx.ch) == -EPROBE_DEFER) {\n" "-\t\t\tdma_release_channel(rs->dma_tx.ch);\n" "-\t\t\trs->dma_tx.ch = NULL;\n" " \t\t\tret = -EPROBE_DEFER;\n" @@ -50,4 +50,4 @@ " \tclk_disable_unprepare(rs->spiclk);\n" err_spiclk_enable: -a94c64a37327feaffe302fc218c73855cd8692966555f0084e7504cccad518cc +da22267dc1c778724ea6dd80d1759abde4ff7549ffa340e70b0de01f99d4dd84
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.