diff for duplicates of <7306460.62PqiTEhxi@wuerfel> diff --git a/a/1.txt b/N1/1.txt index 27bdf85..bf99d93 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -283,7 +283,7 @@ index 3a2adb131d46..cb3e7e3b5027 100644 + schan->real_slave_id = config->slave_id; + + ret = shdma_setup_slave(schan, - config->direction == DMA_DEV_TO_MEM ? + config->direction = DMA_DEV_TO_MEM ? config->src_addr : config->dst_addr); if (ret < 0) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c @@ -307,7 +307,7 @@ index 7d9d6a321521..df3a537f5a83 100644 - cfg.slave_id = slave_id; cfg.direction = direction; - if (direction == DMA_DEV_TO_MEM) { + if (direction = DMA_DEV_TO_MEM) { diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c index 7d077388b9eb..2ba47ab689ff 100644 --- a/drivers/mmc/host/tmio_mmc_dma.c @@ -360,7 +360,7 @@ index 2071f788c6fb..6cbcdc04c947 100644 memset(&cfg, 0, sizeof(cfg)); - cfg.slave_id = id; cfg.direction = dir; - if (dir == DMA_MEM_TO_DEV) { + if (dir = DMA_MEM_TO_DEV) { cfg.dst_addr = port_addr; diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 239be7cbe5a8..786ac9ec11fc 100644 @@ -372,7 +372,7 @@ index 239be7cbe5a8..786ac9ec11fc 100644 memset(&cfg, 0, sizeof(cfg)); - cfg.slave_id = id; cfg.direction = dir; - if (dir == DMA_MEM_TO_DEV) { + if (dir = DMA_MEM_TO_DEV) { cfg.dst_addr = port_addr; diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h index abdf1f229dc3..dd0ba502ccb3 100644 diff --git a/a/content_digest b/N1/content_digest index 20ba586..edc51f1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\087bnmdo9hk.wl%kuninori.morimoto.gx@renesas.com\0" "From\0Arnd Bergmann <arnd@arndb.de>\0" "Subject\0Re: [PATCH 2/9] mmc: tmio: tmio_mmc_host has .dma\0" - "Date\0Mon, 05 Jan 2015 22:33:28 +0100\0" + "Date\0Mon, 05 Jan 2015 21:33:28 +0000\0" "To\0Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>\0" "Cc\0Ulf Hansson <ulf.hansson@linaro.org>" Chris Ball <cjb@laptop.org> @@ -297,7 +297,7 @@ "+\t\t\tschan->real_slave_id = config->slave_id;\n" "+\n" "+\t\tret = shdma_setup_slave(schan,\n" - " \t\t\t\t\tconfig->direction == DMA_DEV_TO_MEM ?\n" + " \t\t\t\t\tconfig->direction = DMA_DEV_TO_MEM ?\n" " \t\t\t\t\tconfig->src_addr : config->dst_addr);\n" " \t\tif (ret < 0)\n" "diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c\n" @@ -321,7 +321,7 @@ "-\tcfg.slave_id = slave_id;\n" " \tcfg.direction = direction;\n" " \n" - " \tif (direction == DMA_DEV_TO_MEM) {\n" + " \tif (direction = DMA_DEV_TO_MEM) {\n" "diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c\n" "index 7d077388b9eb..2ba47ab689ff 100644\n" "--- a/drivers/mmc/host/tmio_mmc_dma.c\n" @@ -374,7 +374,7 @@ " \tmemset(&cfg, 0, sizeof(cfg));\n" "-\tcfg.slave_id = id;\n" " \tcfg.direction = dir;\n" - " \tif (dir == DMA_MEM_TO_DEV) {\n" + " \tif (dir = DMA_MEM_TO_DEV) {\n" " \t\tcfg.dst_addr = port_addr;\n" "diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c\n" "index 239be7cbe5a8..786ac9ec11fc 100644\n" @@ -386,7 +386,7 @@ " \tmemset(&cfg, 0, sizeof(cfg));\n" "-\tcfg.slave_id = id;\n" " \tcfg.direction = dir;\n" - " \tif (dir == DMA_MEM_TO_DEV) {\n" + " \tif (dir = DMA_MEM_TO_DEV) {\n" " \t\tcfg.dst_addr = port_addr;\n" "diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h\n" "index abdf1f229dc3..dd0ba502ccb3 100644\n" @@ -401,4 +401,4 @@ " \t\t\t\t\t * as MID/RID, used with DT */\n" " \tenum shdma_pm_state pm_state;" -cf24c3a1c2a18f494955d1a61aa5f2093a88a34e9d1751d06c31a590092bb0fa +58c9b15ebfe3ad29967ba7631f8e77c692dd496eb8397d6f9e23adf6f0b47c00
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.